r1391 - in /unstable/ffmpeg-debian/debian: changelog confflags rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue Aug 26 13:04:52 UTC 2008


Author: lool
Date: Tue Aug 26 13:04:52 2008
New Revision: 1391

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1391
Log:
Large cleanup to rules logic: drop some cruft, rewrite some small chunks
in a slightly more readable manner, whitespaces, .PHONY fixes...

Modified:
    unstable/ffmpeg-debian/debian/changelog
    unstable/ffmpeg-debian/debian/confflags
    unstable/ffmpeg-debian/debian/rules

Modified: unstable/ffmpeg-debian/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/changelog?rev=1391&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/changelog (original)
+++ unstable/ffmpeg-debian/debian/changelog Tue Aug 26 13:04:52 2008
@@ -2,6 +2,8 @@
 
   * Tweak sed versions regexps to deal with epochs and upstream revisions with
     dashes and be generally stricter.
+  * Large cleanup to rules logic: drop some cruft, rewrite some small chunks
+    in a slightly more readable manner, whitespaces, .PHONY fixes...
 
  -- Loic Minier <lool at dooz.org>  Tue, 26 Aug 2008 14:38:19 +0200
 

Modified: unstable/ffmpeg-debian/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/confflags?rev=1391&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/confflags (original)
+++ unstable/ffmpeg-debian/debian/confflags Tue Aug 26 13:04:52 2008
@@ -1,4 +1,5 @@
 # -*- mode: makefile -*-
+# vim:syntax=make
 #
 # build a static version on every architecture
 # shared is generic, i.e. without arch specific opcodes
@@ -17,15 +18,16 @@
 FLAVORS += vis
 endif
 
-# Comment out the following lines for LGPL versions of the libraries
-gpl_confflags := --enable-gpl
+# Configuration flags causing the libs to be GPL tainted
+gpl_confflags += --enable-gpl
 gpl_confflags += --enable-libfaad
 gpl_confflags += --enable-pp
 gpl_confflags += --enable-swscaler
 gpl_confflags += --enable-x11grab
 
-# Common configuration flags
-confflags := $(gpl_confflags)
+# Common configuration flags; comment out following line for LGPL versions of
+# the libraries
+confflags += $(gpl_confflags)
 confflags += --prefix=/usr
 confflags += --enable-libgsm
 confflags += --enable-libtheora
@@ -36,19 +38,17 @@
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-22-dev
-else
-  lib1394-dev =
+  lib1394-dev += libraw1394-dev, libdc1394-22-dev
 endif
 
+# XXX this probably needs fixing
+CFLAGS :=
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS :=
 # Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
 # and with mmx code enabled.
   confflags += --disable-optimizations
   confflags += --disable-mmx
-else
-  CFLAGS :=
 endif
 
 # Support for additional external codecs
@@ -76,14 +76,14 @@
 nooptflags += --disable-vis
 
 # Configuration flags for the static libraries
-static_build_confflags := $(confflags)
+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 += $(confflags)
 # amd64 has no problems with optimized shared libs. i386 and arm do.
 ifneq      ($(DEB_HOST_ARCH),amd64)
 shared_build_confflags += $(nooptflags)
@@ -93,7 +93,7 @@
 
 ## i386 architecture specific
 # Configuration flags for the optimized shared libraries
-cmov_build_confflags := $(confflags)
+cmov_build_confflags += $(confflags)
 cmov_build_confflags += $(nooptflags)
 cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
 cmov_build_confflags += --cpu='i686'
@@ -105,7 +105,7 @@
 
 ## powerpc architecture specific
 # Configuration flags for the optimized shared libraries
-altivec_build_confflags := $(confflags)
+altivec_build_confflags += $(confflags)
 altivec_build_confflags += --shlibdir=/usr/lib/altivec
 altivec_build_confflags += --cpu='g4'
 altivec_build_confflags += --enable-shared
@@ -118,7 +118,7 @@
 
 ## sparc architecture specific
 # Configuration flags for the optimized shared libraries
-vis_build_confflags := $(confflags)
+vis_build_confflags += $(confflags)
 vis_build_confflags += --shlibdir=/usr/lib/v9
 vis_build_confflags += --cpu='sparc64'
 vis_build_confflags += --enable-shared
@@ -137,5 +137,6 @@
 
 # Additional documentation for PowerPC
 ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
-  extradoc = doc/ffmpeg_powerpc_performance_evaluation_howto.txt
+  extradoc := doc/ffmpeg_powerpc_performance_evaluation_howto.txt
 endif
+

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1391&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Aug 26 13:04:52 2008
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
 
 include /usr/share/quilt/quilt.make
-
-#export DH_VERBOSE=1
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(SRC_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
 
-LIBS := libavutil libavcodec libpostproc libavformat libavdevice libswscale
-
 include debian/confflags
 
-$(info Building FFmpeg for flavors: $(FLAVORS))
-$(info DEB_BUILD_OPTIONS are: $(DEB_BUILD_OPTIONS))
-$(info Using as CFLAGS: $(CFLAGS))
+$(info FLAVORS = $(FLAVORS))
+$(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
+$(info CFLAGS = $(CFLAGS))
 
 config-extra-includes.h:
 	sh debian/fixup-config.sh > $@
 
-configure-%: configure-%-stamp
-configure-%-stamp: $(QUILT_STAMPFN) config-extra-includes.h
+configure-%: configure-stamp-%
+configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
 	mkdir -p debian-$*
 	cd debian-$* && CFLAGS="$(CFLAGS)" ../configure $($*_build_confflags)
@@ -29,38 +25,38 @@
 endif
 	touch $@
 
-build-%: build-%-stamp
-build-%-stamp: configure-%-stamp
+build-%: build-stamp-%
+build-stamp-%: configure-stamp-%
 	dh_testdir
 	$(MAKE) -C debian-$* -j $(NJOBS)
 	touch $@
 
-debian-shared/tools/qt-faststart: build-shared-stamp
+debian-shared/tools/qt-faststart: build-stamp-shared
 	$(MAKE) -C debian-shared tools/qt-faststart
 
 build-doxy: build-doxy-stamp
-build-doxy-stamp: $(QUILT_STAMPFN) 
+build-doxy-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	doxygen
 	touch $@
 
-BUILD_STAMPS=$(foreach flavor,$(FLAVORS),build-$(flavor)-stamp)
 build: build-stamp
-build-stamp: $(BUILD_STAMPS) debian-shared/tools/qt-faststart
+build-stamp: $(addprefix build-stamp-, $(FLAVORS)) debian-shared/tools/qt-faststart
 	touch $@
 
 clean: clean-real unpatch
 clean-real:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp build-*-stamp configure-*-stamp patch-stamp
-	rm -rf $(foreach flavor,$(FLAVORS),debian-$(flavor)) doxy
+	rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
+	    $(addprefix configure-stamp-, $(FLAVORS)) patch-stamp
+	rm -rf $(addprefix debian-, $(FLAVORS)) doxy
 	dh_clean config-extra-includes.h debian/tmp.debhelper.log
 
 get-orig-source:
 	dh_testdir
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
-        # Disable potentially dangerous patented code
+	# Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
 	    -c $(CURDIR)/debian/strip.sh \
@@ -71,9 +67,8 @@
 endif
 
 define install_flavor
-	$(MAKE) -C debian-$(1) install DESTDIR=$(CURDIR)/debian/tmp/ \
+	$(MAKE) -C debian-$(1) install DESTDIR=$(CURDIR)/debian/tmp \
 	    mandir=$(CURDIR)/debian/tmp/usr/share/man
-
 endef
 
 install: build
@@ -85,10 +80,8 @@
 	$(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/
-#	dont fail on binary-indep only builds.
-	if test -d doxy; then \
-		cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/; \
-	fi
+	# don't fail on binary-indep only builds.
+	[ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html
 	cp doc/ffserver.conf debian/tmp/etc/
 	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	dh_install --fail-missing --sourcedir=debian/tmp
@@ -128,9 +121,9 @@
 
 binary: binary-indep binary-arch
 
-.PHONY: build build-shared build-static build-doxy \
+.PHONY: build $(addprefix build-, $(FLAVORS)) build-doxy \
 	clean clean-real \
-	configure configure-shared configure-static \
+	configure $(addprefix configure-, $(FLAVORS)) \
 	binary binary-indep binary-arch \
 	install \
-	patch
+	get-orig-source




More information about the pkg-multimedia-commits mailing list