Package: ffmpeg
Version: 0.cvs20050313-2
Followup-For: Bug #296737

The attached patch enables IEEE1394 support.

Also, the Vorbis support requires Ogg support explicitly enabled, so is
currently disabled even if enabled in config. The attached patch enables
Ogg support to fix this.

Also, the provided patch allows for easy recompilation with additional
support not possible for official Debian releases (implemented similar
to that of netatalk, where linking against OpenSSL is problematic).


Please consider applying... :-)


 - Jonas


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.12-rc1-mm3+debianlogo+squashfs
Locale: LANG=da_DK, LC_CTYPE=da_DK (charmap=ISO-8859-1)

Versions of packages ffmpeg depends on:
ii  libc6         2.3.2.ds1-21               GNU C Library: Shared libraries an
ii  libfreetype6  2.1.7-2.3                  FreeType 2 font engine, shared lib
ii  libimlib2     1.2.0-2.2                  powerful image loading and renderi
ii  libsdl1.2debi 1.2.7+1.2.8cvs20041007-4.1 Simple DirectMedia Layer
ii  libx11-6      4.3.0.dfsg.1-12            X Window System protocol client li
ii  xlibs         4.3.0.dfsg.1-12            X Keyboard Extension (XKB) configu
ii  zlib1g        1:1.2.2-4                  compression library - runtime

-- no debconf information
diff -ruN ffmpeg-0.cvs20050313.debian/debian/changelog 
ffmpeg-0.cvs20050313/debian/changelog
--- ffmpeg-0.cvs20050313.debian/debian/changelog        2005-04-22 
17:15:35.000000000 +0200
+++ ffmpeg-0.cvs20050313/debian/changelog       2005-04-22 17:15:43.000000000 
+0200
@@ -1,3 +1,19 @@
+ffmpeg (0.cvs20050313-2.0.jones.1) unstable; urgency=low
+
+  * Unofficial build based on sid.
+  * Enable Ogg support (required for Vorbis support).
+  * Enable (and build-depend on) these additional libraries:
+    + IEEE1394 / FireWire / iLink (libdc1394-dev and libraw1394-dev).
+  * Conditionally enable these unofficial libraries if DEB_BUILD_OPTIONS
+    includes "risky":
+    + Mpeg2 layer 3 / MP3 (liblame-dev).
+    + FAAD (libfaad2-dev).
+    + FAAC (libfaac-dev).
+    + XviD (libxvidcore-dev).
+  * Add (but disabled for now) additional (possibly problematic) tweaks.
+
+ -- Jonas Smedegaard <[EMAIL PROTECTED]>  Fri, 22 Apr 2005 12:29:04 +0200
+
 ffmpeg (0.cvs20050313-2) unstable; urgency=low
 
   * libavcodec/libpostproc/postprocess_template.c
diff -ruN ffmpeg-0.cvs20050313.debian/debian/control 
ffmpeg-0.cvs20050313/debian/control
--- ffmpeg-0.cvs20050313.debian/debian/control  2005-04-22 17:15:35.000000000 
+0200
+++ ffmpeg-0.cvs20050313/debian/control 2005-04-22 17:15:43.000000000 +0200
@@ -2,7 +2,8 @@
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), libvorbis-dev, liba52-dev, libdts-dev, 
zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, gcc-3.4 
[powerpc]
+Build-Depends: debhelper (>= 4.0), libvorbis-dev, liba52-dev, libdts-dev, 
zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, gcc-3.4 
[powerpc],
+ libraw1394-dev, libdc1394-dev
 Standards-Version: 3.6.1.1
 
 Package: ffmpeg
diff -ruN ffmpeg-0.cvs20050313.debian/debian/rules 
ffmpeg-0.cvs20050313/debian/rules
--- ffmpeg-0.cvs20050313.debian/debian/rules    2005-04-22 17:15:35.000000000 
+0200
+++ ffmpeg-0.cvs20050313/debian/rules   2005-04-22 17:15:43.000000000 +0200
@@ -18,6 +18,35 @@
 confflags += --enable-zlib --enable-vorbis --enable-a52 --enable-dts
 confflags += --disable-debug
 
+# This is required for Vorbis support
+confflags += --enable-ogg
+
+confflags += --enable-dc1394
+
+ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+weak-build-deps += liblame-dev
+confflags += --enable-mp3lame
+
+weak-build-deps += libfaad2-dev
+confflags += --enable-faadbin --enable-faad
+
+weak-build-deps += libfaac-dev
+confflags += --enable-faac
+
+weak-build-deps += libxvidcore-dev
+confflags += --enable-xvid
+
+$(warning Make sure these packages are installed: $(weak-build-deps))
+endif
+
+#confflags += --enable-shared
+#confflags += --enable-pthreads
+
+#confflags += --enable-shared-pp
+
+# Build-depends: libtheora-dev (>> 0.0.0.alpha4)
+#confflags += --enable-theora
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir

Reply via email to