r1274 - /unstable/ffmpeg/debian/
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon Jun 30 13:12:26 UTC 2008
Author: siretart
Date: Mon Jun 30 13:12:26 2008
New Revision: 1274
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1274
Log:
implement build-flavors
Added:
unstable/ffmpeg/debian/confflags
Modified:
unstable/ffmpeg/debian/ (props changed)
unstable/ffmpeg/debian/libavcodec-dev.install
unstable/ffmpeg/debian/libavcodec51.install
unstable/ffmpeg/debian/libavdevice-dev.install
unstable/ffmpeg/debian/libavdevice52.install
unstable/ffmpeg/debian/libavformat-dev.install
unstable/ffmpeg/debian/libavformat52.install
unstable/ffmpeg/debian/libavutil-dev.install
unstable/ffmpeg/debian/libavutil49.install
unstable/ffmpeg/debian/libpostproc-dev.install
unstable/ffmpeg/debian/libpostproc51.install
unstable/ffmpeg/debian/libswscale-dev.install
unstable/ffmpeg/debian/libswscale0.install
unstable/ffmpeg/debian/rules
Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Mon Jun 30 13:12:26 2008
@@ -1,3 +1,1 @@
-.bzr-builddeb bzrbuilddeb-20080628082620-zxaj07pvp5lz4yr1-1
-.bzr-builddeb/default.conf default.conf-20080628082620-zxaj07pvp5lz4yr1-2
-patches/900_doxyfile 900_doxyfile-20080628082845-lbwcc1t9l54y4mmf-1
+confflags confflags-20080630125322-7rg1ieetyenhgll4-1
Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 13:12:26 2008
@@ -16,3 +16,4 @@
45 siretart at tauware.de-20080618204601-vdk7hs1t71u59j4d
50 siretart at tauware.de-20080622093402-afmkqeqt3h21qf7l
51 siretart at tauware.de-20080630102856-77rwx9cthv955qja
+52 siretart at tauware.de-20080630131214-81k1az9u115l7bul
Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Mon Jun 30 13:12:26 2008
@@ -1,5 +1,4 @@
-timestamp: 2008-06-30 12:28:56.588000059 +0200
+timestamp: 2008-06-30 15:12:14.457999945 +0200
committer: Reinhard Tartler <siretart at tauware.de>
properties:
- author: Darren Salt <linux at youmustbejoking.demon.co.uk>
- branch-nick: unstable
+ branch-nick: t
Added: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1274&op=file
==============================================================================
--- unstable/ffmpeg/debian/confflags (added)
+++ unstable/ffmpeg/debian/confflags Mon Jun 30 13:12:26 2008
@@ -1,0 +1,94 @@
+
+# build a static version on every architecture
+# shared is generic, i.e. without arch specific opcodes
+FLAVORS := static shared
+
+# the other flavors always build dynamic versions
+ifeq ($(DEB_HOST_ARCH),i386)
+FLAVORS += cmov
+else ifeq ($(DEB_HOST_ARCH),powerpc)
+FLAVORS += altivec
+else ifeq ($(DEB_HOST_ARCH),sparc)
+FLAVORS += vis
+endif
+
+$(info Building FFMmpeg for flavors: $(FLAVORS))
+
+# Comment out the following lines for LGPL versions of the libraries
+gpl_confflags := --enable-gpl
+gpl_confflags += --enable-liba52
+gpl_confflags += --enable-libfaad
+gpl_confflags += --enable-pp
+gpl_confflags += --enable-swscaler
+gpl_confflags += --enable-x11grab
+
+# Common configuration flags
+confflags := $(gpl_confflags)
+confflags += --prefix=/usr
+confflags += --enable-libgsm
+confflags += --enable-libtheora
+confflags += --enable-libvorbis
+confflags += --enable-pthreads
+confflags += --disable-strip
+
+# Disable architecture-specific optimizations for default shared build
+nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt
+nooptflags += --disable-mmx
+nooptflags += --disable-altivec
+
+# 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
+
+# Configuration flags for the non-optimized shared libraries
+shared_build_confflags := $(confflags)
+shared_build_confflags += $(nooptflags)
+shared_build_confflags += --enable-shared
+shared_build_confflags += --disable-static
+shared_build_confflags += --cpu='generic'
+shared_build_confflags += --extra-cflags="-fPIC -DPIC"
+
+## i386 architecture specific
+# Configuration flags for the optimized shared libraries
+cmov_build_confflags := $(confflags)
+cmov_build_confflags += $(nooptflags)
+cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
+cmov_build_confflags += --cpu='i686'
+cmov_build_confflags += --enable-shared
+cmov_build_confflags += --disable-static
+cmov_build_confflags += --extra-cflags="-fPIC -DPIC"
+cmov_build_confflags += --disable-ffmpeg
+cmov_build_confflags += --disable-vhook
+cmov_build_confflags += --disable-ffserver
+cmov_build_confflags += --disable-ffplay
+
+## powerpc architecture specific
+# Configuration flags for the optimized shared libraries
+altivec_build_confflags := $(confflags)
+altivec_build_confflags += --shlibdir=/usr/lib/altivec
+altivec_build_confflags += --cpu='g4'
+altivec_build_confflags += --enable-shared
+altivec_build_confflags += --disable-static
+altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
+altivec_build_confflags += --enable-altivec
+altivec_build_confflags += --disable-ffmpeg
+altivec_build_confflags += --disable-vhook
+altivec_build_confflags += --disable-ffserver
+altivec_build_confflags += --disable-ffplay
+
+## sparc architecture specific
+# Configuration flags for the optimized shared libraries
+altivec_build_confflags := $(confflags)
+altivec_build_confflags += --shlibdir=/usr/lib/v9
+altivec_build_confflags += --cpu='sparc64'
+altivec_build_confflags += --enable-shared
+altivec_build_confflags += --disable-static
+altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
+altivec_build_confflags += --enable-altivec
+altivec_build_confflags += --disable-ffmpeg
+altivec_build_confflags += --disable-vhook
+altivec_build_confflags += --disable-ffserver
+altivec_build_confflags += --disable-ffplay
Modified: unstable/ffmpeg/debian/libavcodec-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavcodec-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavcodec-dev.install (original)
+++ unstable/ffmpeg/debian/libavcodec-dev.install Mon Jun 30 13:12:26 2008
@@ -2,4 +2,4 @@
usr/include/ffmpeg/avcodec.h
usr/include/ffmpeg/dsputil.h
usr/lib/libavcodec.a
-usr/lib/libavcodec.so
+usr/lib/{,*/,*/*/}libavcodec.so
Modified: unstable/ffmpeg/debian/libavcodec51.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavcodec51.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavcodec51.install (original)
+++ unstable/ffmpeg/debian/libavcodec51.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libavcodec.so.*
+usr/lib/{,*/,*/*/}libavcodec.so.*
Modified: unstable/ffmpeg/debian/libavdevice-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavdevice-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavdevice-dev.install (original)
+++ unstable/ffmpeg/debian/libavdevice-dev.install Mon Jun 30 13:12:26 2008
@@ -1,4 +1,4 @@
usr/lib/pkgconfig/libavdevice.pc
usr/include/ffmpeg/avdevice.h
usr/lib/libavdevice.a
-usr/lib/libavdevice.so
+usr/lib/{,*/,*/*/}libavdevice.so
Modified: unstable/ffmpeg/debian/libavdevice52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavdevice52.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavdevice52.install (original)
+++ unstable/ffmpeg/debian/libavdevice52.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libavdevice.so.*
+usr/lib/{,*/,*/*/}libavdevice.so.*
Modified: unstable/ffmpeg/debian/libavformat-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavformat-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavformat-dev.install (original)
+++ unstable/ffmpeg/debian/libavformat-dev.install Mon Jun 30 13:12:26 2008
@@ -4,4 +4,4 @@
usr/include/ffmpeg/rtsp.h
usr/include/ffmpeg/rtspcodes.h
usr/lib/libavformat.a
-usr/lib/libavformat.so
+usr/lib/{,*/,*/*/}libavformat.so
Modified: unstable/ffmpeg/debian/libavformat52.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavformat52.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavformat52.install (original)
+++ unstable/ffmpeg/debian/libavformat52.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libavformat.so.*
+usr/lib/{,*/,*/*/}libavformat.so.*
Modified: unstable/ffmpeg/debian/libavutil-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavutil-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavutil-dev.install (original)
+++ unstable/ffmpeg/debian/libavutil-dev.install Mon Jun 30 13:12:26 2008
@@ -17,4 +17,4 @@
usr/include/ffmpeg/rational.h
usr/include/ffmpeg/sha1.h
usr/lib/libavutil.a
-usr/lib/libavutil.so
+usr/lib/{,*/,*/*/}libavutil.so
Modified: unstable/ffmpeg/debian/libavutil49.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libavutil49.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libavutil49.install (original)
+++ unstable/ffmpeg/debian/libavutil49.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libavutil.so.*
+usr/lib/{,*/,*/*/}libavutil.so.*
Modified: unstable/ffmpeg/debian/libpostproc-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libpostproc-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libpostproc-dev.install (original)
+++ unstable/ffmpeg/debian/libpostproc-dev.install Mon Jun 30 13:12:26 2008
@@ -1,4 +1,4 @@
usr/lib/pkgconfig/libpostproc.pc
usr/include/postproc/postprocess.h
usr/lib/libpostproc.a
-usr/lib/libpostproc.so
+usr/lib/{,*/,*/*/}libpostproc.so
Modified: unstable/ffmpeg/debian/libpostproc51.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libpostproc51.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libpostproc51.install (original)
+++ unstable/ffmpeg/debian/libpostproc51.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libpostproc.so.*
+usr/lib/{,*/,*/*/}libpostproc.so.*
Modified: unstable/ffmpeg/debian/libswscale-dev.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libswscale-dev.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libswscale-dev.install (original)
+++ unstable/ffmpeg/debian/libswscale-dev.install Mon Jun 30 13:12:26 2008
@@ -2,4 +2,4 @@
usr/include/ffmpeg/swscale.h
usr/include/ffmpeg/rgb2rgb.h
usr/lib/libswscale.a
-usr/lib/libswscale.so
+usr/lib/{,*/,*/*/}libswscale.so
Modified: unstable/ffmpeg/debian/libswscale0.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/libswscale0.install?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/libswscale0.install (original)
+++ unstable/ffmpeg/debian/libswscale0.install Mon Jun 30 13:12:26 2008
@@ -1,1 +1,1 @@
-usr/lib/libswscale.so.*
+usr/lib/{,*/,*/*/}libswscale.so.*
Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1274&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Mon Jun 30 13:12:26 2008
@@ -13,57 +13,14 @@
LIBS := libavutil libavcodec libpostproc libavformat libavdevice libswscale
+include debian/confflags
+
# Support multiple makes at once (taken from the qemu package)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
else
NJOBS := 1
endif
-
-# Comment out the following lines for LGPL versions of the libraries
-gpl_confflags := --enable-gpl
-gpl_confflags += --enable-liba52
-gpl_confflags += --enable-libfaad
-gpl_confflags += --enable-pp
-gpl_confflags += --enable-swscaler
-gpl_confflags += --enable-x11grab
-
-# Common configuration flags
-confflags := $(gpl_confflags)
-confflags += --prefix=/usr
-confflags += --enable-libgsm
-confflags += --enable-libtheora
-confflags += --enable-libvorbis
-confflags += --enable-pthreads
-confflags += --disable-strip
-
-# Disable architecture-specific optimizations for default shared build
-nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt
-nooptflags += --disable-mmx
-nooptflags += --disable-altivec
-
-# 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
-
-# Configuration flags for the optimized shared libraries
-# not used anywhere atm
-opt_shared_build_confflags := $(confflags)
-opt_shared_build_confflags += --enable-shared
-opt_shared_build_confflags += --extra-cflags="-fPIC -DPIC"
-opt_shared_build_confflags += --disable-ffmpeg
-opt_shared_build_confflags += --disable-vhook
-opt_shared_build_confflags += --disable-ffserver
-opt_shared_build_confflags += --disable-ffplay
-
-# Configuration flags for the non-optimized shared libraries
-shared_build_confflags := $(confflags)
-shared_build_confflags += $(nooptflags)
-shared_build_confflags += --enable-shared
-shared_build_confflags += --extra-cflags="-fPIC -DPIC"
ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
confflags += --enable-libdc1394
@@ -129,8 +86,9 @@
doxygen
touch $@
+BUILD_STAMPS=$(foreach flavor,$(FLAVORS),build-$(flavor)-stamp)
build: build-doxy build-stamp
-build-stamp: config-extra-includes.h build-static-stamp build-shared-stamp debian-shared/tools/qt-faststart
+build-stamp: config-extra-includes.h $(BUILD_STAMPS) debian-shared/tools/qt-faststart
touch $@
clean: clean-real unpatch
@@ -154,6 +112,11 @@
-o ../ffmpeg_$(SRC_VERSION).orig.tar.gz
endif
+define install_flavor
+ $(MAKE) -C debian-$(1) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+
+endef
+
install: build
dh_testdir
dh_testroot
@@ -161,8 +124,8 @@
dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
- $(MAKE) -C debian-static install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
- $(MAKE) -C debian-shared install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+ $(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
+
cp -a libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
cp debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
More information about the pkg-multimedia-commits
mailing list