r1393 - in /unstable/ffmpeg-debian/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Aug 26 13:16:31 2008
New Revision: 1393

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1393
Log:
Cleanup internalencoders handling.

Modified:
    unstable/ffmpeg-debian/debian/changelog
    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=1393&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/changelog (original)
+++ unstable/ffmpeg-debian/debian/changelog Tue Aug 26 13:16:31 2008
@@ -3,7 +3,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...
+    in a slightly more readable manner, whitespaces, .PHONY fixes,
+    internalencoders handling...
   * Rename SRC_VERSION to UPSTREAM_VERSION in rules.
 
  -- Loic Minier <lool at dooz.org>  Tue, 26 Aug 2008 14:38:19 +0200

Modified: unstable/ffmpeg-debian/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg-debian/debian/rules?rev=1393&op=diff
==============================================================================
--- unstable/ffmpeg-debian/debian/rules (original)
+++ unstable/ffmpeg-debian/debian/rules Tue Aug 26 13:16:31 2008
@@ -6,21 +6,30 @@
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
 
+internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
+
 include debian/confflags
+
+foo:
+	echo sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
+	    $(if $(internalencoders), -c $(CURDIR)/debian/strip.sh,) \
+	    -o ../ffmpeg-debian_$(UPSTREAM_VERSION).orig.tar.gz
 
 $(info FLAVORS = $(FLAVORS))
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 $(info CFLAGS = $(CFLAGS))
+$(info internalencoders = $(internalencoders))
 
 config-extra-includes.h:
 	sh debian/fixup-config.sh > $@
+
 
 configure-%: configure-stamp-%
 configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
 	mkdir -p debian-$*
 	cd debian-$* && CFLAGS="$(CFLAGS)" ../configure $($*_build_confflags)
-ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
+ifeq ($(internalencoders),)
 	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
 endif
 	touch $@
@@ -55,16 +64,11 @@
 
 get-orig-source:
 	dh_testdir
-ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	# Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
-	    -c $(CURDIR)/debian/strip.sh \
+	    $(if $(internalencoders), -c $(CURDIR)/debian/strip.sh,) \
 	    -o ../ffmpeg-debian_$(UPSTREAM_VERSION).orig.tar.gz
-else
-	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
-	    -o ../ffmpeg_$(UPSTREAM_VERSION).orig.tar.gz
-endif
 
 define install_flavor
 	$(MAKE) -C debian-$(1) install DESTDIR=$(CURDIR)/debian/tmp \