Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 20 years ago
parent
commit
ba28e502c0
4 changed files with 3 additions and 78 deletions
  1. +0
    -34
      package/rene/xine/head-tail.patch.xine-lib
  2. +1
    -1
      package/rene/xine/mkinstalldirs-po-location.patch.xine-ui
  3. +2
    -2
      package/rene/xine/xine.desc
  4. +0
    -41
      package/rene/xine/xv-xm.patch.xine-lib

+ 0
- 34
package/rene/xine/head-tail.patch.xine-lib

@ -1,34 +0,0 @@
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)
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
@@ -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

+ 1
- 1
package/rene/xine/mkinstalldirs-po-location.patch.xine-ui

@ -5,7 +5,7 @@
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)
+mkinstalldirs = ../mkinstalldirs
CC = @CC@
GMSGFMT = @GMSGFMT@

+ 2
- 2
package/rene/xine/xine.desc

@ -42,11 +42,11 @@
[L] GPL
[S] Stable
[V] 1-rc7
[V] 1-rc8
[P] X -?---5---9 170.000
[SRC] .
[D] 3780520825 xine-lib-1-rc7.tar.gz http://dl.sourceforge.net/xine/
[D] 2274531976 xine-lib-1-rc8.tar.gz http://dl.sourceforge.net/xine/
[D] 1173347734 xine-ui-0.99.2.tar.gz http://dl.sourceforge.net/xine/

+ 0
- 41
package/rene/xine/xv-xm.patch.xine-lib

@ -1,41 +0,0 @@
# --- 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/xv-xm.patch.xine-lib
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
#
# --- 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 @@
fi
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- xv_lib="libXv.a"
+ xv_lib="libXv.so"

Loading…
Cancel
Save