[SCM] x264/master: Build both 8bit and 10bit versions of libx264, Closes: #667573

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Oct 14 20:54:59 UTC 2012


The following commit has been merged in the master branch:
commit ceab497a30560db9db7bf6ded594400f76a2686a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Oct 14 16:53:58 2012 -0400

    Build both 8bit and 10bit versions of libx264, Closes: #667573

diff --git a/debian/libx264N.install.in b/debian/libx264N.install.in
index 96b2468..07cbc55 100644
--- a/debian/libx264N.install.in
+++ b/debian/libx264N.install.in
@@ -1 +1,2 @@
 shared/usr/lib/@DEB_HOST_MULTIARCH@/libx264.so.*     usr/lib/@DEB_HOST_MULTIARCH@
+shared/usr/lib/@DEB_HOST_MULTIARCH@/x264-10bit/libx264.so.*     usr/lib/@DEB_HOST_MULTIARCH@/x264-10bit
diff --git a/debian/rules b/debian/rules
index 0b68d9e..6f20d0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,22 @@ ifeq ($(do_opt),yes)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt
 endif
+	# now do the 10 bit builds
+	$(MAKE) distclean
+	CFLAGS="$(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags) --bit-depth=10 \
+	   || ( tail -v -n +0 config.log config.log ; exit 1 )
+	$(MAKE)
+	install -d -m755 $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
+	install -m755 libx264.so.* $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
+ifeq ($(do_opt),yes)
+	$(MAKE) distclean
+	# Build opt lib
+	LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags) --bit-depth=10 \
+	   || ( tail -v -n +0 config.log config.log ; exit 1 )
+	$(MAKE)
+	install -d -m755 $(CURDIR)/debian/install/opt/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
+	install -d -m755 libx264.so.* $(CURDIR)/debian/install/opt/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
+endif
 
 override_dh_auto_configure:
 	# dh_auto_configure phase handled via dh_auto_build.

-- 
x264 packaging



More information about the pkg-multimedia-commits mailing list