[svn] r4829 - in trunk/rpms: libmpeg3 transcode zapping zvbi

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Tue Oct 17 13:10:56 CEST 2006 

Author: thias
Date: 2006-10-17 13:10:45 +0200 (Tue, 17 Oct 2006)
New Revision: 4829

Added:
   trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch
   trunk/rpms/zvbi/zvbi-0.2.19-compiler.h.patch
Modified:
   trunk/rpms/libmpeg3/libmpeg3.spec
   trunk/rpms/transcode/transcode.spec
   trunk/rpms/zapping/zapping.spec
   trunk/rpms/zvbi/zvbi.spec
Log:
Misc minor fixes.


Modified: trunk/rpms/libmpeg3/libmpeg3.spec
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3.spec	2006-10-17 10:52:55 UTC (rev 4828)
+++ trunk/rpms/libmpeg3/libmpeg3.spec	2006-10-17 11:10:45 UTC (rev 4829)
@@ -5,7 +5,7 @@
 Summary: Decoder of various derivatives of MPEG standards
 Name: libmpeg3
 Version: 1.7
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://heroinewarrior.com/libmpeg3.php3
@@ -62,7 +62,8 @@
 %ifarch i686 athlon
 %{__perl} -pi -e 's|^USE_MMX = 0|USE_MMX = 1|g' Makefile
 %endif
-%{__make} %{?_smp_mflags}
+# EOF error which requires a second make invocation. Needs to be investigated
+%{__make} %{?_smp_mflags} || %{__make} %{?_smp_mflags}
 
 
 %install
@@ -95,6 +96,9 @@
 
 
 %changelog
+* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2
+- Run make twice since there is an EOF error that makes the first run abort.
+
 * Mon Jul  3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1
 - Update to 1.7.
 

Added: trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch
===================================================================
--- trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch	                        (rev 0)
+++ trunk/rpms/transcode/transcode-1.0.2-libavcodec.patch	2006-10-17 11:10:45 UTC (rev 4829)
@@ -0,0 +1,30 @@
+--- transcode-1.0.2.orig/configure	2005-11-06 07:04:59.000000000 +0100
++++ transcode-1.0.2/configure	2005-11-06 07:04:59.000000000 +0100
+@@ -28107,7 +28107,12 @@ main()
+     printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after 20040703");
+     return(1);
+   }
++  /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */
++#ifdef LIBAVCODEC_BUILD >= 3344640
++  printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
++#else
+   printf("VER=%s\n", FFMPEG_VERSION);
++#endif /* LIBAVCODEC_BUILD >= 51.9.0 check */
+   printf("BUILD=%d\n", LIBAVCODEC_BUILD);
+   return(0);
+ }
+--- transcode-1.0.2.orig/configure.in	2005-10-30 05:57:45.000000000 +0100
++++ transcode-1.0.2/configure.in	2005-10-30 05:57:45.000000000 +0100
+@@ -628,7 +628,12 @@ main()
+     printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after 20040703");
+     return(1);
+   }
++  /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */
++#ifdef LIBAVCODEC_BUILD >= 3344640
++  printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
++#else
+   printf("VER=%s\n", FFMPEG_VERSION);
++#endif /* LIBAVCODEC_BUILD >= 51.9.0 check */
+   printf("BUILD=%d\n", LIBAVCODEC_BUILD);
+   return(0);
+ }

Modified: trunk/rpms/transcode/transcode.spec
===================================================================
--- trunk/rpms/transcode/transcode.spec	2006-10-17 10:52:55 UTC (rev 4828)
+++ trunk/rpms/transcode/transcode.spec	2006-10-17 11:10:45 UTC (rev 4829)
@@ -29,7 +29,7 @@
 Summary: Linux video stream processing utility
 Name: transcode
 Version: 1.0.2
-Release: 10%{?prever:.%{prever}}
+Release: 11%{?prever:.%{prever}}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.transcoding.org/
@@ -39,6 +39,7 @@
 Patch2: transcode-1.0.x-filter-patch.txt
 Patch3: transcode-1.0.2-lzo2.patch
 Patch4: transcode-1.0.2-libmpeg3.patch
+Patch5: transcode-1.0.2-libavcodec.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gcc-c++, gtk+-devel, SDL-devel, libxml2-devel, libjpeg-devel
 BuildRequires: freetype-devel >= 2.0, libogg-devel, libvorbis-devel
@@ -83,6 +84,7 @@
 %patch2 -p0 -b .filter-patch
 %patch3 -p1 -b .lzo2
 %patch4 -p1 -b .libmpeg3
+%patch5 -p1 -b .libavcodec
 
 
 %build
@@ -140,6 +142,9 @@
 
 
 %changelog
+* Tue Sep 19 2006 Matthias Saou <http://freshrpms.net/> 1.0.2-11
+- Add patch for recent ffmpeg (libavcodec) versions detection.
+
 * Mon Jul 31 2006 Matthias Saou <http://freshrpms.net/> 1.0.2-10
 - Add lzo2 patch from Gentoo.
 - Add patch to compile against libmpeg3 1.7 (mpeg3_open error_return change).

Modified: trunk/rpms/zapping/zapping.spec
===================================================================
--- trunk/rpms/zapping/zapping.spec	2006-10-17 10:52:55 UTC (rev 4828)
+++ trunk/rpms/zapping/zapping.spec	2006-10-17 11:10:45 UTC (rev 4829)
@@ -22,7 +22,7 @@
 BuildRequires: libgnomeui-devel, libglade2-devel, gtk2-devel >= 2.4
 BuildRequires: scrollkeeper, gettext, libjpeg-devel, libpng-devel
 BuildRequires: zvbi-devel, arts-devel, lirc-devel
-BuildRequires: python-devel, desktop-file-utils, gcc-c++
+BuildRequires: python-devel, desktop-file-utils, gcc-c++, intltool
 %{?_with_modxorg:BuildRequires: libXt-devel, libXv-devel, libXmu-devel, libXxf86dga-devel, libXxf86vm-devel}
 %{!?_without_rte:BuildRequires: rte-devel >= 0.5}
 # This one is to get /usr/bin/consolehelper

Added: trunk/rpms/zvbi/zvbi-0.2.19-compiler.h.patch
===================================================================
--- trunk/rpms/zvbi/zvbi-0.2.19-compiler.h.patch	                        (rev 0)
+++ trunk/rpms/zvbi/zvbi-0.2.19-compiler.h.patch	2006-10-17 11:10:45 UTC (rev 4829)
@@ -0,0 +1,11 @@
+diff -Naupr zvbi-0.2.19.orig/src/videodev2k.h zvbi-0.2.19/src/videodev2k.h
+--- zvbi-0.2.19.orig/src/videodev2k.h	2005-09-11 09:53:52.000000000 +0200
++++ zvbi-0.2.19/src/videodev2k.h	2006-09-19 10:49:15.000000000 +0200
+@@ -16,7 +16,6 @@
+ #ifdef __KERNEL__
+ #include <linux/time.h> /* need struct timeval */
+ #endif
+-#include <linux/compiler.h> /* need __user */
+ 
+ /*
+  *	M I S C E L L A N E O U S

Modified: trunk/rpms/zvbi/zvbi.spec
===================================================================
--- trunk/rpms/zvbi/zvbi.spec	2006-10-17 10:52:55 UTC (rev 4828)
+++ trunk/rpms/zvbi/zvbi.spec	2006-10-17 11:10:45 UTC (rev 4829)
@@ -16,6 +16,7 @@
 Group: Applications/Multimedia
 URL: http://zapping.sourceforge.net/
 Source: http://dl.sf.net/zapping/zvbi-%{version}.tar.bz2
+Patch0: zvbi-0.2.19-compiler.h.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libpng-devel, gcc-c++, doxygen, gettext
 %{?_with_modxorg:BuildRequires: libXt-devel}
@@ -44,6 +45,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .compiler.h
 
 
 %build
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Tue Sep 19 2006 Matthias Saou <http://freshrpms.net/> 0.2.21-2
+- Add patch to remove linux/compiler.h include.
+
 * Thu May 11 2006 Dag Wieers <dag at wieers.com> - 0.2.21-1
 - Updated to release 0.2.21.

More information about the svn-commits mailing list