r1491 - in /experimental/ffmpeg-debian/debian: changelog confflags control libavfilter-dev.install libavfilter0.install rules

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Tue Sep 23 11:02:00 2008
New Revision: 1491

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1491
Log:
  * debian/confflags, debian/control, debian/rules, debian/libavfilter*:
    + Built libavfilter and disabled vhook in turn (Closes: #499787).


Added:
    experimental/ffmpeg-debian/debian/libavfilter-dev.install
    experimental/ffmpeg-debian/debian/libavfilter0.install
Modified:
    experimental/ffmpeg-debian/debian/changelog
    experimental/ffmpeg-debian/debian/confflags
    experimental/ffmpeg-debian/debian/control
    experimental/ffmpeg-debian/debian/rules

Modified: experimental/ffmpeg-debian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/changelog?rev=1491&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/changelog (original)
+++ experimental/ffmpeg-debian/debian/changelog Tue Sep 23 11:02:00 2008
@@ -36,6 +36,8 @@
     + Updated inter-package dependencies and demoted Depends on external
       library packages to Suggests, since we shouldn't encourage package
       maintainers to link statically against libav*.
+  * debian/confflags, debian/control, debian/rules, debian/libavfilter*:
+    + Built libavfilter and disabled vhook in turn (Closes: #499787).
 
   [ Loic Minier ]
   * Remove debug echo which broke shlibs, sorry.

Modified: experimental/ffmpeg-debian/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/confflags?rev=1491&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/confflags (original)
+++ experimental/ffmpeg-debian/debian/confflags Tue Sep 23 11:02:00 2008
@@ -29,12 +29,15 @@
 # the libraries
 confflags += $(gpl_confflags)
 confflags += --prefix=/usr
+confflags += --enable-avfilter
+confflags += --enable-avfilter-lavf
 confflags += --enable-libgsm
 confflags += --enable-libschroedinger
 confflags += --enable-libtheora
 confflags += --enable-libvorbis
 confflags += --enable-pthreads
 confflags += --disable-stripping
+confflags += --disable-vhook
 
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
@@ -79,7 +82,6 @@
 # Configuration flags for the static libraries
 static_build_confflags += $(confflags)
 static_build_confflags += --disable-ffmpeg
-static_build_confflags += --disable-vhook
 static_build_confflags += --disable-ffserver
 static_build_confflags += --disable-ffplay
 

Modified: experimental/ffmpeg-debian/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/control?rev=1491&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/control (original)
+++ experimental/ffmpeg-debian/debian/control Tue Sep 23 11:02:00 2008
@@ -110,6 +110,17 @@
  This package contains a Debian-specific version of the libavformat shared
  object that should only be used by Debian packages.
 
+Package: libavfilter0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: ffmpeg video filtering library
+ This is the video filtering library from the ffmpeg project.
+ .
+ This package contains a Debian-specific version of the libavfilter shared
+ object that should only be used by Debian packages.
+
 Package: libpostproc51
 Section: libs
 Architecture: any
@@ -188,6 +199,17 @@
  This package contains the header files and static libraries needed to
  compile applications or shared objects that use libavformat.
 
+Package: libavfilter-dev
+Section: libdevel
+Architecture: any
+Depends: libavfilter0 (= ${binary:Version}),
+         libavcodec-dev (= ${binary:Version})
+Description: development files for libavfilter
+ This is the video filtering library from the ffmpeg project.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavfilter.
+
 Package: libpostproc-dev
 Section: libdevel
 Architecture: any

Added: experimental/ffmpeg-debian/debian/libavfilter-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavfilter-dev.install?rev=1491&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavfilter-dev.install (added)
+++ experimental/ffmpeg-debian/debian/libavfilter-dev.install Tue Sep 23 11:02:00 2008
@@ -1,0 +1,4 @@
+usr/include/libavfilter
+usr/lib/libavfilter.a
+usr/lib/{,*/,*/*/}libavfilter.so
+usr/lib/pkgconfig/libavfilter.pc

Added: experimental/ffmpeg-debian/debian/libavfilter0.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/libavfilter0.install?rev=1491&op=file
==============================================================================
--- experimental/ffmpeg-debian/debian/libavfilter0.install (added)
+++ experimental/ffmpeg-debian/debian/libavfilter0.install Tue Sep 23 11:02:00 2008
@@ -1,0 +1,1 @@
+usr/lib/{,*/,*/*/}libavfilter.so.*

Modified: experimental/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg-debian/debian/rules?rev=1491&op=diff
==============================================================================
--- experimental/ffmpeg-debian/debian/rules (original)
+++ experimental/ffmpeg-debian/debian/rules Tue Sep 23 11:02:00 2008
@@ -8,7 +8,7 @@
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
 SHLIBS_VERSION := 0.svn20080206-8
 
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|postproc|avformat|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))