[SCM] libav/experimental: no longer build libpostproc, dropped upstream

Sat May 12 17:55:41 UTC 2012

The following commit has been merged in the experimental branch:
commit de7b96ed46973b22a247ef7590df50356842f109
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 29 17:31:42 2012 +0200

    no longer build libpostproc, dropped upstream

diff --git a/debian/confflags b/debian/confflags
index 614599c..ff14bcc 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -88,7 +88,6 @@ endef
 
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
-gpl_confflags += --enable-postproc
 gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
diff --git a/debian/control b/debian/control
index c866920..bb3f281 100644
--- a/debian/control
+++ b/debian/control
@@ -137,7 +137,6 @@ Depends:
  libavdevice53 (= ${binary:Version}),
  libavformat53 (= ${binary:Version}),
  libavutil51 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
  libswscale2 (= ${binary:Version}),
  ${misc:Depends}
 Description: Debug symbols for Libav related packages
@@ -315,25 +314,6 @@ Description: Libav video filtering library
  .
  This is the video filtering library from Libav.
 
-Package: libpostproc52
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Provides:
- libpostproc-extra-52
-Replaces:
- libpostproc-extra-52
-Breaks:
- libpostproc-extra-52 (<< 5:0.8.1-2)
-Description: Libav video postprocessing library
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video postprocessing library from Libav.
-
 Package: libswscale2
 Architecture: any
 Multi-Arch: same
@@ -447,22 +427,6 @@ Description: Development files for libavfilter
  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
-Depends:
- libavutil-dev (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libpostproc
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This is the video postprocessing library from Libav.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
-
 Package: libswscale-dev
 Section: libdevel
 Architecture: any
@@ -557,21 +521,6 @@ Description: Libav filter library (transitional package)
  This package is only used for transitional purposes and can be safely
  removed when no other packages depend on this package.
 
-Package: libpostproc-extra-52
-Section: oldlibs
-Priority: extra
-Architecture: all
-Multi-Arch: foreign
-Depends:
- libpostproc52,
- ${misc:Depends},
-Description: Libav video postprocessing library (transitional package)
- Libav is a complete, cross-platform solution to decode, encode, record,
- convert and stream audio and video.
- .
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
-
 Package: libavformat-extra-53
 Section: oldlibs
 Priority: extra
diff --git a/debian/libav-extra-dbg.copyright b/debian/libav-extra-dbg.copyright
index ddda12a..e3301ae 100644
--- a/debian/libav-extra-dbg.copyright
+++ b/debian/libav-extra-dbg.copyright
@@ -39,13 +39,6 @@ The following files are licensed under the GNU GPL, as clarified below:
  * libavformat:
    + x11grab.c
    + gxfenc.c
- * libpostproc:
-   + postprocess_internal.h
-   + postprocess_altivec_template.c
-   + postprocess.h
-   + postprocess_template.c
-   + postprocess.c
-   + mangle.h
  * libswscale:
    + swscale.c
    + swscale-example.c
diff --git a/debian/libavcodec-extra-53.copyright b/debian/libavcodec-extra-53.copyright
index ddda12a..e3301ae 100644
--- a/debian/libavcodec-extra-53.copyright
+++ b/debian/libavcodec-extra-53.copyright
@@ -39,13 +39,6 @@ The following files are licensed under the GNU GPL, as clarified below:
  * libavformat:
    + x11grab.c
    + gxfenc.c
- * libpostproc:
-   + postprocess_internal.h
-   + postprocess_altivec_template.c
-   + postprocess.h
-   + postprocess_template.c
-   + postprocess.c
-   + mangle.h
  * libswscale:
    + swscale.c
    + swscale-example.c
diff --git a/debian/libpostproc-dev.install.in b/debian/libpostproc-dev.install.in
deleted file mode 100644
index bf4bcb5..0000000
--- a/debian/libpostproc-dev.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/libpostproc
-usr/lib/@DEB_HOST_MULTIARCH@/libpostproc.a
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libpostproc.so
-usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/libpostproc.pc
diff --git a/debian/libpostproc52.install.in b/debian/libpostproc52.install.in
deleted file mode 100644
index 5c4aee3..0000000
--- a/debian/libpostproc52.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@DEB_HOST_MULTIARCH_OPT@/libpostproc.so.*
diff --git a/debian/libpostproc52.lintian-overrides b/debian/libpostproc52.lintian-overrides
deleted file mode 100644
index 8d37b3c..0000000
--- a/debian/libpostproc52.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Overriding these fpic lintian errors. Please see bug #528080.
-libpostproc52: shlib-with-non-pic-code
diff --git a/debian/rules b/debian/rules
index 9e1e2ce..19e7b06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SHLIBS_VERSION := 5:0.8-2~
 
-LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
@@ -159,7 +159,7 @@ binary-arch: build install
 	dh_installdocs doc/optimization.txt
 	dh_installdocs -A debian/README.Debian
 	dh_installdocs -p libavcodec-dev -plibavdevice-dev \
-		-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
+		-plibavformat-dev -plibavfilter-dev \
 		-plibswscale-dev -plibavutil-dev -plibav-doc \
 		doc/APIchanges
 	dh_installexamples -p libav-tools doc/avserver.conf debian/recordshow.sh

-- 
Libav/FFmpeg packaging

