From bb0e0794645430c29a61c7bb0f40c67b6bfe843c Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 26 Nov 2004 02:54:49 +0000 Subject: [PATCH] Stefan Fiedler: xine: fix head-tail issue Index: package/rene/xine/head-tail.patch.xine-lib =================================================================== [2004110516042304395] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4818 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/xine/head-tail.patch.xine-lib | 37 +++ package/rene/xine/head-tail.patch.xine-ui | 260 +++++++++++++++++++++ 2 files changed, 297 insertions(+) create mode 100644 package/rene/xine/head-tail.patch.xine-lib create mode 100644 package/rene/xine/head-tail.patch.xine-ui diff --git a/package/rene/xine/head-tail.patch.xine-lib b/package/rene/xine/head-tail.patch.xine-lib new file mode 100644 index 000000000..f37a52601 --- /dev/null +++ b/package/rene/xine/head-tail.patch.xine-lib @@ -0,0 +1,37 @@ +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 +@@ -1910,7 +1910,7 @@ + dnl Some informations about xine-lib compilation + dnl --------------------------------------------- + +-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\"`" + AC_SUBST(XINE_BUILD_CC) +Nur in xine-lib-1-rc6a-p/: configure.ac~. +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 +@@ -1,5 +1,5 @@ + # For updating this file, look at the result of: +-# head -3 po/POTFILES.in > /tmp/POTFILES.in && find src -name "*.[chy]" | xargs grep -l '[^A-Za-z_]_(' | grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/ ++# head -n3 po/POTFILES.in > /tmp/POTFILES.in && find src -name "*.[chy]" | xargs grep -l '[^A-Za-z_]_(' | grep -v src/xine-engine/xineintl.h >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/ + + 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 new file mode 100644 index 000000000..812caf444 --- /dev/null +++ b/package/rene/xine/head-tail.patch.xine-ui @@ -0,0 +1,260 @@ +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 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++# #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.57. + # +@@ -28176,7 +28176,7 @@ + fi + + +-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\"`" + +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 +@@ -610,8 +610,8 @@ + fi + fi + done +- short=`head -1 <$tmpfile` +- description="`tail +2 <$tmpfile`" ++ short=`head -n1 <$tmpfile` ++ description="`tail -n+2 <$tmpfile`" + rm $tmpfile + if test -z "$short"; then + echo "internal error: no message for $id" >&2 +@@ -903,7 +903,7 @@ + if search -x xine "$PATH"; then + xine_executable1=`echo "$found"|sort|uniq` + if [ `echo "$xine_executable1" | wc -l` -gt 1 ]; then +- xine_executable=`echo "$xine_executable1" | head -1` ++ xine_executable=`echo "$xine_executable1" | head -n1` + msg several-xine-in-path 1 + else + xine_executable="$xine_executable1" +@@ -922,7 +922,7 @@ + xine_config=`echo "$found"|sort|uniq` + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-in-path 0 +@@ -932,7 +932,7 @@ + xine_config="$found"; + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-somewhere 0 +@@ -1102,7 +1102,7 @@ + + search -x hdparm "$PATH" || search -x bin/hdparm || search -x sbin/hdparm; + if test -n "$found"; then +- hdparm=`echo "$found"|head -1` ++ hdparm=`echo "$found"|head -n1` + fi + + case "$DVDROM" in +@@ -1145,8 +1145,8 @@ + # Xv extension + search -x xvinfo "$PATH" || search -x bin/xvinfo; + if test -n "$found"; then +- xvinfo=`echo "$found"|head -1` +- XVIDEO=`$xvinfo|head -1` ++ xvinfo=`echo "$found"|head -n1` ++ XVIDEO=`$xvinfo|head -n1` + msg have-xv 0 + YUV=false + YUY2=false +@@ -1387,7 +1387,7 @@ + echo "Subject: $subject" + + if search -x mail "$PATH" || search -x mailx "$PATH"; then +- mailer=`echo "$found"|head -1` ++ mailer=`echo "$found"|head -n1` + echo "Alternatively, I could try to send the bug report for you, using" + echo $mailer -s \""$subject"\" + echo 'Please make sure to add the additional description before saying "yes"!' +diff -dur xine-ui-0.99.2/misc/xine-check xine-ui-0.99.2-p/misc/xine-check +--- xine-ui-0.99.2/misc/xine-check 2004-07-04 18:26:48.000000000 +0200 ++++ xine-ui-0.99.2-p/misc/xine-check 2004-11-04 19:45:54.521268624 +0100 +@@ -610,8 +610,8 @@ + fi + fi + done +- short=`head -1 <$tmpfile` +- description="`tail +2 <$tmpfile`" ++ short=`head -n1 <$tmpfile` ++ description="`tail -n+2 <$tmpfile`" + rm $tmpfile + if test -z "$short"; then + echo "internal error: no message for $id" >&2 +@@ -903,7 +903,7 @@ + if search -x xine "$PATH"; then + xine_executable1=`echo "$found"|sort|uniq` + if [ `echo "$xine_executable1" | wc -l` -gt 1 ]; then +- xine_executable=`echo "$xine_executable1" | head -1` ++ xine_executable=`echo "$xine_executable1" | head -n1` + msg several-xine-in-path 1 + else + xine_executable="$xine_executable1" +@@ -922,7 +922,7 @@ + xine_config=`echo "$found"|sort|uniq` + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-in-path 0 +@@ -932,7 +932,7 @@ + xine_config="$found"; + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-somewhere 0 +@@ -1102,7 +1102,7 @@ + + search -x hdparm "$PATH" || search -x bin/hdparm || search -x sbin/hdparm; + if test -n "$found"; then +- hdparm=`echo "$found"|head -1` ++ hdparm=`echo "$found"|head -n1` + fi + + case "$DVDROM" in +@@ -1145,8 +1145,8 @@ + # Xv extension + search -x xvinfo "$PATH" || search -x bin/xvinfo; + if test -n "$found"; then +- xvinfo=`echo "$found"|head -1` +- XVIDEO=`$xvinfo|head -1` ++ xvinfo=`echo "$found"|head -n1` ++ XVIDEO=`$xvinfo|head -n1` + msg have-xv 0 + YUV=false + YUY2=false +@@ -1387,7 +1387,7 @@ + echo "Subject: $subject" + + if search -x mail "$PATH" || search -x mailx "$PATH"; then +- mailer=`echo "$found"|head -1` ++ mailer=`echo "$found"|head -n1` + echo "Alternatively, I could try to send the bug report for you, using" + echo $mailer -s \""$subject"\" + echo 'Please make sure to add the additional description before saying "yes"!' +diff -dur xine-ui-0.99.2/misc/xine-check.sh.in xine-ui-0.99.2-p/misc/xine-check.sh.in +--- xine-ui-0.99.2/misc/xine-check.sh.in 2004-04-15 21:27:20.000000000 +0200 ++++ xine-ui-0.99.2-p/misc/xine-check.sh.in 2004-11-04 19:45:32.670590432 +0100 +@@ -187,8 +187,8 @@ + fi + fi + done +- short=`head -1 <$tmpfile` +- description="`tail +2 <$tmpfile`" ++ short=`head -n1 <$tmpfile` ++ description="`tail -n+2 <$tmpfile`" + rm $tmpfile + if test -z "$short"; then + echo "internal error: no message for $id" >&2 +@@ -480,7 +480,7 @@ + if search -x xine "$PATH"; then + xine_executable1=`echo "$found"|sort|uniq` + if [ `echo "$xine_executable1" | wc -l` -gt 1 ]; then +- xine_executable=`echo "$xine_executable1" | head -1` ++ xine_executable=`echo "$xine_executable1" | head -n1` + msg several-xine-in-path 1 + else + xine_executable="$xine_executable1" +@@ -499,7 +499,7 @@ + xine_config=`echo "$found"|sort|uniq` + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-in-path 0 +@@ -509,7 +509,7 @@ + xine_config="$found"; + if [ `echo "$xine_config" | wc -l` -gt 1 ]; then + xine_configs="$xine_config" +- xine_config=`echo "$xine_configs" | head -1` ++ xine_config=`echo "$xine_configs" | head -n1` + msg several-xine-config 1 + else + msg xine-config-somewhere 0 +@@ -679,7 +679,7 @@ + + search -x hdparm "$PATH" || search -x bin/hdparm || search -x sbin/hdparm; + if test -n "$found"; then +- hdparm=`echo "$found"|head -1` ++ hdparm=`echo "$found"|head -n1` + fi + + case "$DVDROM" in +@@ -722,8 +722,8 @@ + # Xv extension + search -x xvinfo "$PATH" || search -x bin/xvinfo; + if test -n "$found"; then +- xvinfo=`echo "$found"|head -1` +- XVIDEO=`$xvinfo|head -1` ++ xvinfo=`echo "$found"|head -n1` ++ XVIDEO=`$xvinfo|head -n1` + msg have-xv 0 + YUV=false + YUY2=false +@@ -964,7 +964,7 @@ + echo "Subject: $subject" + + if search -x mail "$PATH" || search -x mailx "$PATH"; then +- mailer=`echo "$found"|head -1` ++ mailer=`echo "$found"|head -n1` + echo "Alternatively, I could try to send the bug report for you, using" + echo $mailer -s \""$subject"\" + echo 'Please make sure to add the additional description before saying "yes"!' +diff -dur xine-ui-0.99.2/po/POTFILES.in xine-ui-0.99.2-p/po/POTFILES.in +--- xine-ui-0.99.2/po/POTFILES.in 2004-06-18 23:12:07.000000000 +0200 ++++ xine-ui-0.99.2-p/po/POTFILES.in 2004-11-04 19:44:39.075738088 +0100 +@@ -1,5 +1,5 @@ + # For updating this file, look at the result of: +-# $ head -3 po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' src/xitk/*.[chy] | grep -v src/xitk/session_ctrl.c >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/ ++# $ head -n3 po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' src/xitk/*.[chy] | grep -v src/xitk/session_ctrl.c >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/ + + src/xitk/actions.c + src/xitk/config_wrapper.c +diff -dur xine-ui-0.99.2/src/xitk/xine-toolkit/po/POTFILES.in xine-ui-0.99.2-p/src/xitk/xine-toolkit/po/POTFILES.in +--- xine-ui-0.99.2/src/xitk/xine-toolkit/po/POTFILES.in 2002-05-31 14:34:03.000000000 +0200 ++++ xine-ui-0.99.2-p/src/xitk/xine-toolkit/po/POTFILES.in 2004-11-04 19:44:34.688405064 +0100 +@@ -1,5 +1,5 @@ + # For updating this file, look at the result of: +-# $ head -3 src/xitk/xine-toolkit/po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' src/xitk/xine-toolkit/*.[chy] >> /tmp/POTFILES.in && cp /tmp/POTFILES.in src/xitk/xine-toolkit/po/ ++# $ head -n3 src/xitk/xine-toolkit/po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' src/xitk/xine-toolkit/*.[chy] >> /tmp/POTFILES.in && cp /tmp/POTFILES.in src/xitk/xine-toolkit/po/ + + src/xitk/xine-toolkit/mrlbrowser.c + src/xitk/xine-toolkit/test.c