r851 - in /unstable/x264/debian: changelog patches/20_use-deb-host-gnu-type.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Aug 12 12:26:25 2007
New Revision: 851

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=851
Log:
* Normalize triplet into quadruplet.

Modified:
    unstable/x264/debian/changelog
    unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch

Modified: unstable/x264/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/changelog?rev=851&op=diff
==============================================================================
--- unstable/x264/debian/changelog (original)
+++ unstable/x264/debian/changelog Sun Aug 12 12:26:25 2007
@@ -5,8 +5,9 @@
   * 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; should really be a --build argument, but this
-    requires some larger refactoring.
+    ./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.
 
  -- Loic Minier <lool at dooz.org>  Sun, 12 Aug 2007 11:54:31 +0200
 

Modified: unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch?rev=851&op=diff
==============================================================================
--- unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch (original)
+++ unstable/x264/debian/patches/20_use-deb-host-gnu-type.patch Sun Aug 12 12:26:25 2007
@@ -1,18 +1,58 @@
 Use $DEB_HOST_GNU_TYPE instead of ./config.guess if it's set; should really
 be a --build argument, but this requires some larger refactoring.
 
---- x264-0.svn20070309.orig/configure	2007-08-12 11:46:20.000000000 +0200
-+++ x264-0.svn20070309/configure	2007-08-12 11:48:22.000000000 +0200
-@@ -76,7 +76,11 @@
+--- x264-0.svn20070309.orig/configure	2007-08-12 14:24:29.000000000 +0200
++++ x264-0.svn20070309/configure	2007-08-12 14:24:34.000000000 +0200
+@@ -76,9 +76,26 @@
    exit 1
  fi
  
 -MACHINE="$(./config.guess)"
 +if [ -n "$DEB_HOST_GNU_TYPE" ]; then
-+    MACHINE="$DEB_HOST_GNU_TYPE"
++    host=$DEB_HOST_GNU_TYPE
 +else
-+    MACHINE="$(./config.guess)"
++    host=`./config.guess`
 +fi
++# normalize any triplet into a quadruplet
++host=`./config.sub $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 "${MACHINE#*-*-}" in
+-case "${MACHINE#*-*-}" in
++case $host_os in
    beos*)
+     SYS="BEOS"
+     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+@@ -130,12 +147,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 +207,7 @@
+     ARCH="PARISC"
+     ;;
+   *)
+-    ARCH="$(echo ${MACHINE%%-*} | tr a-z A-Z)"
++    ARCH="$(echo $host_cpu | tr a-z A-Z)"
+     ;;
+ esac
+