r856 - in /unstable/x264/debian: changelog patches/020_host-flag-support.patch patches/020_use-deb-host-gnu-type.patch patches/series rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sun Aug 12 14:56:31 UTC 2007
Author: lool
Date: Sun Aug 12 14:56:31 2007
New Revision: 856
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=856
Log:
* New patch, 020_host-flag-support, adds support for the --host flag in
configure; from upstream SVN r669.
* Pass --host to configure.
Added:
unstable/x264/debian/patches/020_host-flag-support.patch
Removed:
unstable/x264/debian/patches/020_use-deb-host-gnu-type.patch
Modified:
unstable/x264/debian/changelog
unstable/x264/debian/patches/series
unstable/x264/debian/rules
Modified: unstable/x264/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/changelog?rev=856&op=diff
==============================================================================
--- unstable/x264/debian/changelog (original)
+++ unstable/x264/debian/changelog Sun Aug 12 14:56:31 2007
@@ -3,17 +3,15 @@
* Cleanup rules.
* Pass --quiltrc /dev/null to quilt.
* get-orig-source implementaiton; thanks Kilian Krause.
- * Pass DEB_HOST_GNU_TYPE to configure.
- * New patch, 20_use-deb-host-gnu-type, use $DEB_HOST_GNU_TYPE instead of
- ./config.guess if it's set; normalize any triplet into a quadruplet via
- config.sub; should really be a --build argument, but this requires some
- larger refactoring.
* Copy config.guess and .sub from autotools-dev before building; build-dep
on autotools-dev.
* Run ./configure before make clean as the upstream Makefile is present by
default and will run configure automatically; grmpf.
+ * New patch, 020_host-flag-support, adds support for the --host flag in
+ configure; from upstream SVN r669.
+ * Pass --host to configure.
- -- Loic Minier <lool at dooz.org> Sun, 12 Aug 2007 14:32:06 +0200
+ -- Loic Minier <lool at dooz.org> Sun, 12 Aug 2007 16:53:14 +0200
x264 (0.svn20070309-4) unstable; urgency=low
Added: unstable/x264/debian/patches/020_host-flag-support.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/patches/020_host-flag-support.patch?rev=856&op=file
==============================================================================
--- unstable/x264/debian/patches/020_host-flag-support.patch (added)
+++ unstable/x264/debian/patches/020_host-flag-support.patch Sun Aug 12 14:56:31 2007
@@ -1,0 +1,234 @@
+--- configure.orig 2007-08-12 16:51:51.000000000 +0200
++++ configure 2007-08-12 16:52:51.000000000 +0200
+@@ -19,6 +19,7 @@
+ echo " --extra-asflags=EASFLAGS add EASFLAGS to ASFLAGS"
+ echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS"
+ echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS"
++echo " --host=HOST build programs to run on HOST"
+ echo ""
+ exit 1
+ fi
+@@ -76,9 +77,109 @@
+ exit 1
+ fi
+
+-MACHINE="$(./config.guess)"
++# parse options
++
++for opt do
++ optarg="${opt#*=}"
++ case "$opt" in
++ --prefix=*)
++ prefix="$optarg"
++ ;;
++ --exec-prefix=*)
++ exec_prefix="$optarg"
++ ;;
++ --bindir=*)
++ bindir="$optarg"
++ ;;
++ --libdir=*)
++ libdir="$optarg"
++ ;;
++ --includedir=*)
++ includedir="$optarg"
++ ;;
++ --enable-avis-input)
++ avis_input="yes"
++ ;;
++ --disable-avis-input)
++ avis_input="no"
++ ;;
++ --enable-mp4-output)
++ mp4_output="yes"
++ ;;
++ --disable-mp4-output)
++ mp4_output="no"
++ ;;
++ --extra-asflags=*)
++ ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
++ ;;
++ --extra-cflags=*)
++ CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
++ ;;
++ --extra-ldflags=*)
++ LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
++ ;;
++ --enable-pthread)
++ pthread="auto" # can't skip detection, since it differs by OS
++ ;;
++ --disable-pthread)
++ pthread="no"
++ ;;
++ --enable-debug)
++ debug="yes"
++ ;;
++ --enable-gprof)
++ CFLAGS="$CFLAGS -pg"
++ LDFLAGS="$LDFLAGS -pg"
++ gprof="yes"
++ ;;
++ --enable-pic)
++ pic="yes"
++ ;;
++ --enable-gtk)
++ gtk="yes"
++ ;;
++ --disable-gtk)
++ gtk="no"
++ ;;
++ --enable-shared)
++ shared="yes"
++ if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
++ pic="yes"
++ fi
++ ;;
++ --enable-visualize)
++ LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
++ CFLAGS="$CFLAGS -DVISUALIZE=1"
++ vis="yes"
++ ;;
++ --host=*)
++ host="${opt#--host=}"
++ ;;
++ *)
++ echo "Unknown option $opt, ignored"
++ ;;
++ esac
++done
++
++if [ "x$host" = x ]; then
++ host=`./config.guess`
++fi
++# normalize a triplet into a quadruplet
++host=`./config.sub $host`
+
+-case "${MACHINE#*-*-}" in
++# split $host
++save_ifs=$IFS
++IFS='-'
++# set positional parameters
++set x $host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++host_os=$*
++IFS=$save_ifs
++
++case $host_os in
+ beos*)
+ SYS="BEOS"
+ CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+@@ -130,12 +231,12 @@
+ HAVE_GETOPT_LONG=0
+ ;;
+ *)
+- echo "Unknown system $MACHINE, edit the configure"
++ echo "Unknown system $host, edit the configure"
+ exit 1
+ ;;
+ esac
+
+-case "${MACHINE%%-*}" in
++case $host_cpu in
+ i*86)
+ ARCH="X86"
+ CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
+@@ -190,7 +291,7 @@
+ ARCH="PARISC"
+ ;;
+ *)
+- ARCH="$(echo ${MACHINE%%-*} | tr a-z A-Z)"
++ ARCH="$(echo $host_cpu | tr a-z A-Z)"
+ ;;
+ esac
+
+@@ -211,87 +312,6 @@
+
+ CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
+
+-# parse options
+-
+-for opt do
+- optarg="${opt#*=}"
+- case "$opt" in
+- --prefix=*)
+- prefix="$optarg"
+- ;;
+- --exec-prefix=*)
+- exec_prefix="$optarg"
+- ;;
+- --bindir=*)
+- bindir="$optarg"
+- ;;
+- --libdir=*)
+- libdir="$optarg"
+- ;;
+- --includedir=*)
+- includedir="$optarg"
+- ;;
+- --enable-avis-input)
+- avis_input="yes"
+- ;;
+- --disable-avis-input)
+- avis_input="no"
+- ;;
+- --enable-mp4-output)
+- mp4_output="yes"
+- ;;
+- --disable-mp4-output)
+- mp4_output="no"
+- ;;
+- --extra-asflags=*)
+- ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
+- ;;
+- --extra-cflags=*)
+- CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
+- ;;
+- --extra-ldflags=*)
+- LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+- ;;
+- --enable-pthread)
+- pthread="auto" # can't skip detection, since it differs by OS
+- ;;
+- --disable-pthread)
+- pthread="no"
+- ;;
+- --enable-debug)
+- debug="yes"
+- ;;
+- --enable-gprof)
+- CFLAGS="$CFLAGS -pg"
+- LDFLAGS="$LDFLAGS -pg"
+- gprof="yes"
+- ;;
+- --enable-pic)
+- pic="yes"
+- ;;
+- --enable-gtk)
+- gtk="yes"
+- ;;
+- --disable-gtk)
+- gtk="no"
+- ;;
+- --enable-shared)
+- shared="yes"
+- if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
+- pic="yes"
+- fi
+- ;;
+- --enable-visualize)
+- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+- CFLAGS="$CFLAGS -DVISUALIZE=1"
+- vis="yes"
+- ;;
+- *)
+- echo "Unknown option $opt, ignored"
+- ;;
+- esac
+-done
+-
+ # autodetect options that weren't forced nor disabled
+
+ libpthread=""
Modified: unstable/x264/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/patches/series?rev=856&op=diff
==============================================================================
--- unstable/x264/debian/patches/series (original)
+++ unstable/x264/debian/patches/series Sun Aug 12 14:56:31 2007
@@ -1,3 +1,3 @@
005_link_with_shared_lib.diff
010_altivec_crash.diff -p0
-020_use-deb-host-gnu-type.patch
+020_host-flag-support.patch -p0
Modified: unstable/x264/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/rules?rev=856&op=diff
==============================================================================
--- unstable/x264/debian/rules (original)
+++ unstable/x264/debian/rules Sun Aug 12 14:56:31 2007
@@ -2,12 +2,14 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
confflags := \
--enable-debug \
--enable-pthread \
--prefix=/usr \
+ --host=$(DEB_HOST_GNU_TYPE)
CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
More information about the pkg-multimedia-commits
mailing list