From dc8f2df879861b9b0b2ac07e0eaf6ac99c93ee61 Mon Sep 17 00:00:00 2001 From: fake Date: Wed, 5 Jan 2005 11:44:30 +0000 Subject: [PATCH] fake: split the xine package into 'xine-lib' and 'xine-ui' and update xine-lib to 1.0 and xine-ui to 0.99.3. please svn rm package/rene/xine [2004122908354825648] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5426 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/xine-lib/xine-lib.conf | 28 ++ package/rene/xine-lib/xine-lib.desc | 48 ++++ package/rene/xine-ui/head-tail.patch | 260 ++++++++++++++++++ .../xine-ui/mkinstalldirs-po-location.patch | 11 + package/rene/xine-ui/strange-test-bug.patch | 22 ++ package/rene/xine-ui/xine-ui.desc | 43 +++ 6 files changed, 412 insertions(+) create mode 100644 package/rene/xine-lib/xine-lib.conf create mode 100644 package/rene/xine-lib/xine-lib.desc create mode 100644 package/rene/xine-ui/head-tail.patch create mode 100644 package/rene/xine-ui/mkinstalldirs-po-location.patch create mode 100644 package/rene/xine-ui/strange-test-bug.patch create mode 100644 package/rene/xine-ui/xine-ui.desc diff --git a/package/rene/xine-lib/xine-lib.conf b/package/rene/xine-lib/xine-lib.conf new file mode 100644 index 000000000..22b8ba790 --- /dev/null +++ b/package/rene/xine-lib/xine-lib.conf @@ -0,0 +1,28 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/rene/xine-lib/xine-lib.conf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +# we force -O2 or -Os, but xine want's to build some stuff with -O3. +# it looks like gcc produces wrong MMX code in some cases if it's not +# running with -O3 as passed by xine. +var_remove_regex GCC_WRAPPER_REMOVE " " "-O.*" + diff --git a/package/rene/xine-lib/xine-lib.desc b/package/rene/xine-lib/xine-lib.desc new file mode 100644 index 000000000..b61b1e64c --- /dev/null +++ b/package/rene/xine-lib/xine-lib.desc @@ -0,0 +1,48 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/rene/xine-lib/xine-lib.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] An open source media player + +[T] Xine is an open source media player for free OSs. Xine is capable of +[T] playing mpeg and libavifile supported media natively. The integrated DVD +[T] plugin plays unencrypted DVDs with full menu support. With the help of +[T] libdvdcss encrypted DVDs can be played as well. +[T] Other plugins for (S)VCD, CD-Audio and several streamed media available. +[T] It's also possible to install Windows DLLs for RealPlayer, Windows Media +[T] and QuickTime support on the x86 platform. + +[U] http://xine.sourceforge.net + +[A] Guenter Bartsch +[A] many more +[M] unmaintained + +[C] extra/multimedia + +[L] GPL +[S] Stable +[V] 1.0 +[P] X -?---5---9 170.000 + +[D] 0 xine-lib-1.0.tar.gz http://dl.sourceforge.net/xine/ + diff --git a/package/rene/xine-ui/head-tail.patch b/package/rene/xine-ui/head-tail.patch new file mode 100644 index 000000000..f62c2fc61 --- /dev/null +++ b/package/rene/xine-ui/head-tail.patch @@ -0,0 +1,260 @@ +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 +@@ -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/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 diff --git a/package/rene/xine-ui/mkinstalldirs-po-location.patch b/package/rene/xine-ui/mkinstalldirs-po-location.patch new file mode 100644 index 000000000..e9f7ff707 --- /dev/null +++ b/package/rene/xine-ui/mkinstalldirs-po-location.patch @@ -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-ui/strange-test-bug.patch b/package/rene/xine-ui/strange-test-bug.patch new file mode 100644 index 000000000..7c7ab72ab --- /dev/null +++ b/package/rene/xine-ui/strange-test-bug.patch @@ -0,0 +1,22 @@ +--- ./misc/Makefile.am.orig 2004-12-01 22:15:59.768577368 +0100 ++++ ./misc/Makefile.am 2004-12-01 22:16:18.036800176 +0100 +@@ -27,7 +27,7 @@ + chmod a+x xine-check + + xine-bugreport: xine-check +- test ! -f xine-bugreport && $(LN_S) xine-check xine-bugreport ++ if test ! -f xine-bugreport ; then $(LN_S) xine-check xine-bugreport ; fi + + + debug: +--- ./misc/Makefile.in.orig 2004-12-01 22:17:13.376387280 +0100 ++++ ./misc/Makefile.in 2004-12-01 22:17:31.632611912 +0100 +@@ -623,7 +623,7 @@ + chmod a+x xine-check + + xine-bugreport: xine-check +- test ! -f xine-bugreport && $(LN_S) xine-check xine-bugreport ++ if test ! -f xine-bugreport ; then $(LN_S) xine-check xine-bugreport ; fi + + debug: + @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/package/rene/xine-ui/xine-ui.desc b/package/rene/xine-ui/xine-ui.desc new file mode 100644 index 000000000..be052f5cd --- /dev/null +++ b/package/rene/xine-ui/xine-ui.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/rene/xine-ui/xine-ui.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] A GUI for xine + +[T] This is the 'default' user interface for the media player library xine. +[T] Other frontends and themes can be found on the project's page. + +[U] http://xine.sourceforge.net + +[A] Guenter Bartsch +[A] many more +[M] unmaintained + +[C] extra/multimedia + +[L] GPL +[S] Stable +[V] 0.99.3 +[P] X -?---5---9 170.000 + +[D] 0 xine-ui-0.99.3.tar.gz http://dl.sourceforge.net/xine/ +