From 24ec26f5b923d6592d13fd6cc07f6a7ab59d6270 Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 13 Dec 2004 16:51:42 +0000 Subject: [PATCH] fake: xine: add one more fix (hell, who writes these scripts?) juggle around in other patches, patching configure.* before configure, and add the xv-shared patch to the configure.ac, too. [2004121001183302925] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5187 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/xine/head-tail.patch.xine-lib | 27 +++++++++---------- package/rene/xine/head-tail.patch.xine-ui | 24 ++++++++--------- .../mkinstalldirs-po-location.patch.xine-ui | 11 ++++++++ package/rene/xine/xv-xm.patch.xine-lib | 11 ++++++++ 4 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 package/rene/xine/mkinstalldirs-po-location.patch.xine-ui diff --git a/package/rene/xine/head-tail.patch.xine-lib b/package/rene/xine/head-tail.patch.xine-lib index f37a52601..3e1c45ef6 100644 --- a/package/rene/xine/head-tail.patch.xine-lib +++ b/package/rene/xine/head-tail.patch.xine-lib @@ -1,16 +1,3 @@ -diff -dur xine-lib-1-rc6a/configure xine-lib-1-rc6a-p/configure ---- xine-lib-1-rc6a/configure 2004-09-16 17:14:46.000000000 +0200 -+++ xine-lib-1-rc6a-p/configure 2004-11-04 19:42:29.611419656 +0100 -@@ -42456,7 +42456,7 @@ - - - --XINE_BUILD_CC="`$CC -v 2>&1 | tail -1`" -+XINE_BUILD_CC="`$CC -v 2>&1 | tail -n1`" - XINE_BUILD_OS="`uname -s -r -m`" - XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`" - -Nur in xine-lib-1-rc6a-p/: configure~. diff -dur xine-lib-1-rc6a/configure.ac xine-lib-1-rc6a-p/configure.ac --- xine-lib-1-rc6a/configure.ac 2004-09-16 17:10:45.000000000 +0200 +++ xine-lib-1-rc6a-p/configure.ac 2004-11-04 19:42:03.004464528 +0100 @@ -23,7 +10,18 @@ diff -dur xine-lib-1-rc6a/configure.ac xine-lib-1-rc6a-p/configure.ac XINE_BUILD_OS="`uname -s -r -m`" XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`" AC_SUBST(XINE_BUILD_CC) -Nur in xine-lib-1-rc6a-p/: configure.ac~. +diff -dur xine-lib-1-rc6a/configure xine-lib-1-rc6a-p/configure +--- xine-lib-1-rc6a/configure 2004-09-16 17:14:46.000000000 +0200 ++++ xine-lib-1-rc6a-p/configure 2004-11-04 19:42:29.611419656 +0100 +@@ -42456,7 +42456,7 @@ + + + +-XINE_BUILD_CC="`$CC -v 2>&1 | tail -1`" ++XINE_BUILD_CC="`$CC -v 2>&1 | tail -n1`" + XINE_BUILD_OS="`uname -s -r -m`" + XINE_BUILD_DATE="`date \"+%a %d %b %Y %T\"`" + diff -dur xine-lib-1-rc6a/po/POTFILES.in xine-lib-1-rc6a-p/po/POTFILES.in --- xine-lib-1-rc6a/po/POTFILES.in 2004-09-16 17:17:02.000000000 +0200 +++ xine-lib-1-rc6a-p/po/POTFILES.in 2004-11-04 19:41:41.175782992 +0100 @@ -34,4 +32,3 @@ diff -dur xine-lib-1-rc6a/po/POTFILES.in xine-lib-1-rc6a-p/po/POTFILES.in src/audio_out/audio_alsa_out.c src/audio_out/audio_arts_out.c -Nur in xine-lib-1-rc6a-p/po: POTFILES.in~. diff --git a/package/rene/xine/head-tail.patch.xine-ui b/package/rene/xine/head-tail.patch.xine-ui index 812caf444..f62c2fc61 100644 --- a/package/rene/xine/head-tail.patch.xine-ui +++ b/package/rene/xine/head-tail.patch.xine-ui @@ -1,3 +1,15 @@ +diff -dur xine-ui-0.99.2/configure.ac xine-ui-0.99.2-p/configure.ac +--- xine-ui-0.99.2/configure.ac 2004-07-04 17:51:02.000000000 +0200 ++++ xine-ui-0.99.2-p/configure.ac 2004-11-04 19:58:17.541312408 +0100 +@@ -580,7 +580,7 @@ + dnl + dnl + dnl +-BUILD_CC="`$CC -v 2>&1 | tail -1`" ++BUILD_CC="`$CC -v 2>&1 | tail -n1`" + BUILD_OS="`uname -s -r -m`" + BUILD_DATE="`date \"+%a %d %b %Y %T\"`" + AC_SUBST(BUILD_CC) diff -dur xine-ui-0.99.2/configure xine-ui-0.99.2-p/configure --- xine-ui-0.99.2/configure 2004-07-04 18:26:08.000000000 +0200 +++ xine-ui-0.99.2-p/configure 2004-11-04 19:58:35.301612432 +0100 @@ -16,18 +28,6 @@ diff -dur xine-ui-0.99.2/configure xine-ui-0.99.2-p/configure BUILD_OS="`uname -s -r -m`" BUILD_DATE="`date \"+%a %d %b %Y %T\"`" -diff -dur xine-ui-0.99.2/configure.ac xine-ui-0.99.2-p/configure.ac ---- xine-ui-0.99.2/configure.ac 2004-07-04 17:51:02.000000000 +0200 -+++ xine-ui-0.99.2-p/configure.ac 2004-11-04 19:58:17.541312408 +0100 -@@ -580,7 +580,7 @@ - dnl - dnl - dnl --BUILD_CC="`$CC -v 2>&1 | tail -1`" -+BUILD_CC="`$CC -v 2>&1 | tail -n1`" - BUILD_OS="`uname -s -r -m`" - BUILD_DATE="`date \"+%a %d %b %Y %T\"`" - AC_SUBST(BUILD_CC) diff -dur xine-ui-0.99.2/misc/xine-bugreport xine-ui-0.99.2-p/misc/xine-bugreport --- xine-ui-0.99.2/misc/xine-bugreport 2004-07-04 18:26:48.000000000 +0200 +++ xine-ui-0.99.2-p/misc/xine-bugreport 2004-11-04 19:46:59.925325696 +0100 diff --git a/package/rene/xine/mkinstalldirs-po-location.patch.xine-ui b/package/rene/xine/mkinstalldirs-po-location.patch.xine-ui new file mode 100644 index 000000000..ecc9b00fb --- /dev/null +++ b/package/rene/xine/mkinstalldirs-po-location.patch.xine-ui @@ -0,0 +1,11 @@ +--- ./po/Makefile.in.in.orig 2004-12-09 23:29:33.783069128 +0100 ++++ ./po/Makefile.in.in 2004-12-09 23:29:52.996148296 +0100 +@@ -31,7 +31,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = `if test ! -z "$(mkdir_p)"; then echo "$(mkdir_p)"; else case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_srcdir)/$(MKINSTALLDIRS)" ;; esac; fi` ++mkinstalldirs = $(MKINSTALLDIRS) + + CC = @CC@ + GMSGFMT = @GMSGFMT@ diff --git a/package/rene/xine/xv-xm.patch.xine-lib b/package/rene/xine/xv-xm.patch.xine-lib index 3e547aed7..f46457fe0 100644 --- a/package/rene/xine/xv-xm.patch.xine-lib +++ b/package/rene/xine/xv-xm.patch.xine-lib @@ -17,6 +17,17 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +--- ./configure.ac.orig 2004-12-10 00:40:11.003913648 +0100 ++++ ./configure.ac 2004-12-10 00:46:52.890817552 +0100 +@@ -490,7 +490,7 @@ + dnl static linking is preferred! + dnl but only dynamic linking is possible when using libtool < 1.4.0 + +-AC_PREREQ_LIBTOOL(1.4.0, xv_lib="libXv.a", xv_lib="libXv.so") ++AC_PREREQ_LIBTOOL(1.4.0, xv_lib="libXv.so", xv_lib="libXv.so") + + host_or_hostalias="$host" + if test "$host_or_hostalias" = ""; then --- xine-lib-1-rc2//configure.orig 2004-03-22 07:32:29.000000000 +0100 +++ xine-lib-1-rc2//configure 2004-03-22 07:32:45.000000000 +0100 @@ -25026,7 +25026,7 @@