[paketler-commits] r23302 - in devel/applications/multimedia/ffmpeg: . files

[paketler-commits at pardus.org.tr]

Author: cartman
Date: Sun Apr 15 20:08:08 2007
New Revision: 23302

Removed:
   devel/applications/multimedia/ffmpeg/files/version.patch
Modified:
   devel/applications/multimedia/ffmpeg/actions.py
   devel/applications/multimedia/ffmpeg/files/amr-fixed.patch.bz2
   devel/applications/multimedia/ffmpeg/files/ffmpeg-dont-print-config.patch
   devel/applications/multimedia/ffmpeg/pspec.xml
Log:
new release with amrwb dependency and some small fixes, still too many regressions


Modified: devel/applications/multimedia/ffmpeg/actions.py
=================================================================
--- devel/applications/multimedia/ffmpeg/actions.py	(original)
+++ devel/applications/multimedia/ffmpeg/actions.py	Sun Apr 15 20:08:08 2007
@@ -11,9 +11,15 @@
 from pisi.actionsapi import get
 
 WorkDir = "ffmpeg-%s" % get.srcVERSION().split('_')[-1]
+Revision = "8742"
 
 def setup():
-    shelltools.export("CFLAGS","") # Use ffmpeg's CFLAGS
+    shelltools.export("CFLAGS","") # Use FFmpeg's CFLAGS
+
+    # Setup version.h
+    shelltools.unlink("version.sh")
+    shelltools.echo("version.sh",'echo "#define FFMPEG_VERSION \\"SVN-r%s\\"" > version.h' % Revision)
+    shelltools.chmod("version.sh")
 
     # CPU thing is just used for CMOV detection
     autotools.rawConfigure("--cpu=i686 \
@@ -52,4 +58,3 @@
 
     pisitools.dodoc("Changelog", "README", "doc/*.txt")
     pisitools.dohtml("doc/faq.html", "doc/ffmpeg-doc.html", "doc/ffplay-doc.html", "doc/hooks.html")
-

Modified: devel/applications/multimedia/ffmpeg/files/amr-fixed.patch.bz2
=================================================================
Binary files. No diff available.

Modified: devel/applications/multimedia/ffmpeg/files/ffmpeg-dont-print-config.patch
=================================================================
--- devel/applications/multimedia/ffmpeg/files/ffmpeg-dont-print-config.patch	(original)
+++ devel/applications/multimedia/ffmpeg/files/ffmpeg-dont-print-config.patch	Sun Apr 15 20:08:08 2007
@@ -1,8 +1,8 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 7378)
+--- ffmpeg.c	(revision 8723)
 +++ ffmpeg.c	(working copy)
-@@ -3811,13 +3811,13 @@
+@@ -3654,13 +3654,13 @@
  static void show_banner(void)
  {
      fprintf(stderr, "FFmpeg version " FFMPEG_VERSION ", Copyright (c) 2000-2007 Fabrice Bellard, et al.\n");
@@ -18,7 +18,7 @@
 +    //fprintf(stderr, "  built on " __DATE__ " " __TIME__);
  #ifdef __GNUC__
 -    fprintf(stderr, ", gcc: " __VERSION__ "\n");
-+    //fprintf(stderr, ", gcc: " __VERSION__ "\n");
++    fprintf(stderr, "Compiled with gcc " __VERSION__ "\n");
  #else
      fprintf(stderr, ", using a non-gcc compiler\n");
  #endif

Modified: devel/applications/multimedia/ffmpeg/pspec.xml
=================================================================
--- devel/applications/multimedia/ffmpeg/pspec.xml	(original)
+++ devel/applications/multimedia/ffmpeg/pspec.xml	Sun Apr 15 20:08:08 2007
@@ -14,7 +14,7 @@
         <Summary xml:lang="tr">FFmpeg ses ve görüntü dosyalarını kaydedebilen, dönüştürebilen ve açabilen yazılımdır</Summary>
         <Description>FFmpeg is a complete solution to record, convert and stream audio and video. It includes libavcodec, the leading audio/video codec library.FFmpeg is developed under Linux, but it can compiled under most operating systems, including Windows.</Description>
         <Description xml:lang="tr">FFmpeg ses ve görüntü dosyalarını kaydedebilen,dönüştürebilen ve açabilen komple bir çözüm. libavcodec ve birçok popüler ses/görüntü codeclerini içerir.FFmpeg linux altında geliştirilmiş olmasına rağmen windows'un da dahil olduğu birçok işletim sistemi altında derlenip çalıştırılabilir</Description>
-        <Archive sha1sum="2123651a0b058591b531db56cdcc198b4dcfa5f5" type="tarbz2">http://cekirdek.pardus.org.tr/~ismail/dist/ffmpeg-20070406.tar.bz2</Archive>
+        <Archive sha1sum="7f085bd5fb880bdd56de0aa6041997665ef0cd0b" type="tarbz2">http://cekirdek.pardus.org.tr/~ismail/dist/ffmpeg-20070415.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>faac</Dependency>
             <Dependency versionFrom="2.5">faad2</Dependency>
@@ -31,13 +31,13 @@
             <Dependency versionFrom="1.1.0">xvid</Dependency>
             <Dependency>libtheora</Dependency>
             <Dependency>gsm</Dependency>
+            <Dependency>amrwb</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch>ffmpeg-dv1394.patch</Patch>
-            <Patch level="1" compressionType="bz2">amr-fixed.patch.bz2</Patch>
+            <Patch compressionType="bz2">amr-fixed.patch.bz2</Patch>
             <Patch>ffmpeg-dont-print-config.patch</Patch>
             <Patch>no-rle-warning.patch</Patch>
-            <Patch>version.patch</Patch>
         </Patches>
     </Source>
 
@@ -58,6 +58,7 @@
             <Dependency versionFrom="1.1.0">xvid</Dependency>
             <Dependency>libtheora</Dependency>
             <Dependency>gsm</Dependency>
+            <Dependency>amrwb</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -71,8 +72,8 @@
 
     <History>
         <Update release="25">
-            <Date>2007-04-06</Date>
-            <Version>0.4.9_20070406</Version>
+            <Date>2007-04-15</Date>
+            <Version>0.4.9_20070415</Version>
             <Comment>Version bump</Comment>
             <Name>İsmail Dönmez</Name>
             <Email>ismail at pardus.org.tr</Email>