OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Apr-2004 14:29:55
Branch: HEAD Handle: 2004042013295500
Modified files:
openpkg-src/xine-ui xine-ui.patch xine-ui.spec
Log:
Upgrade package 0.9.23 -> 0.99.1, and patch code because FreeBSD
doesn't seem to support ISO C99 fully (macros for printing format
specifiers are missing) and readline headers potentially conflict
Summary:
Revision Changes Path
1.3 +64 -27 openpkg-src/xine-ui/xine-ui.patch
1.20 +5 -4 openpkg-src/xine-ui/xine-ui.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xine-ui/xine-ui.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xine-ui.patch
--- openpkg-src/xine-ui/xine-ui.patch 7 Apr 2004 13:37:14 -0000 1.2
+++ openpkg-src/xine-ui/xine-ui.patch 20 Apr 2004 12:29:55 -0000 1.3
@@ -1,6 +1,7 @@
Index: src/common/utils.c
---- src/common/utils.c.orig 2003-12-18 01:30:11.000000000 +0100
-+++ src/common/utils.c 2003-12-25 09:56:03.000000000 +0100
+diff -Nau src/common/utils.c.orig src/common/utils.c
+--- src/common/utils.c.orig 2004-04-17 00:08:51.000000000 +0200
++++ src/common/utils.c 2004-04-20 12:21:33.000000000 +0200
@@ -34,7 +34,6 @@
#include <sys/stat.h>
#include <sys/wait.h>
@@ -9,11 +10,39 @@
#ifdef HAVE_X11
#include <X11/Xlib.h>
---- src/xitk/Makefile.in.orig 2004-04-07 12:49:16.000000000 +0200
-+++ src/xitk/Makefile.in 2004-04-07 12:49:50.000000000 +0200
-@@ -370,10 +370,10 @@
- tvout.$(OBJEXT) tvset.$(OBJEXT) videowin.$(OBJEXT) \
- viewlog.$(OBJEXT)
+Index: src/aaui/Makefile.in
+diff -Nau src/aaui/Makefile.in.orig src/aaui/Makefile.in
+--- src/aaui/Makefile.in.orig 2004-04-17 00:11:49.000000000 +0200
++++ src/aaui/Makefile.in 2004-04-20 12:21:33.000000000 +0200
+@@ -208,7 +208,7 @@
+
+ am_aaxine_OBJECTS = $(am__objects_1) aaxine-main.$(OBJEXT)
+ aaxine_OBJECTS = $(am_aaxine_OBJECTS)
+-aaxine_LDFLAGS =
++aaxine_LDFLAGS = -Wl,-E
+ am_cacaxine_OBJECTS = $(am__objects_1) cacaxine-main.$(OBJEXT)
+ cacaxine_OBJECTS = $(am_cacaxine_OBJECTS)
+ cacaxine_LDFLAGS =
+Index: src/fb/Makefile.in
+diff -Nau src/fb/Makefile.in.orig src/fb/Makefile.in
+--- src/fb/Makefile.in.orig 2004-04-17 00:11:51.000000000 +0200
++++ src/fb/Makefile.in 2004-04-20 12:21:33.000000000 +0200
+@@ -199,7 +199,7 @@
+ stdctl.$(OBJEXT) post.$(OBJEXT) osd.$(OBJEXT) \
+ config_wrapper.$(OBJEXT)
+ fbxine_OBJECTS = $(am_fbxine_OBJECTS)
+-fbxine_LDFLAGS =
++fbxine_LDFLAGS = -Wl,-E
+
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+Index: src/xitk/Makefile.in
+diff -Nau src/xitk/Makefile.in.orig src/xitk/Makefile.in
+--- src/xitk/Makefile.in.orig 2004-04-17 00:11:52.000000000 +0200
++++ src/xitk/Makefile.in 2004-04-20 12:21:33.000000000 +0200
+@@ -318,10 +318,10 @@
+ tvout.$(OBJEXT) tvset.$(OBJEXT) videowin.$(OBJEXT) \
+ viewlog.$(OBJEXT)
xine_OBJECTS = $(am_xine_OBJECTS)
-xine_LDFLAGS =
+xine_LDFLAGS = -Wl,-E
@@ -22,27 +51,35 @@
-xine_remote_LDFLAGS =
+xine_remote_LDFLAGS = -Wl,-E
+ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
---- src/aaui/Makefile.in.orig 2004-04-07 12:44:19.000000000 +0200
-+++ src/aaui/Makefile.in 2004-04-07 12:45:56.000000000 +0200
-@@ -245,7 +245,7 @@
+Index: src/xitk/event.c
+diff -Nau src/xitk/event.c.orig src/xitk/event.c
+--- src/xitk/event.c.orig 2004-04-20 14:01:44.000000000 +0200
++++ src/xitk/event.c 2004-04-20 14:01:47.000000000 +0200
+@@ -298,7 +298,7 @@
+ ds = sec / 10;
+ sec -= 10 * ds;
- am_aaxine_OBJECTS = $(am__objects_1) main.$(OBJEXT)
- aaxine_OBJECTS = $(am_aaxine_OBJECTS)
--aaxine_LDFLAGS =
-+aaxine_LDFLAGS = -Wl,-E
+- snprintf(buf, sizeof(buf), "%s%02" PRIi64 ":%d%.2f (%" PRIi64 " pts)", sign ?
"-" : "", min, ds, sec, pts);
++ snprintf(buf, sizeof(buf), "%s%02li:%d%.2f (%li pts)", sign ? "-" : "", min, ds,
sec, pts);
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
---- src/fb/Makefile.in.orig 2004-04-07 12:47:12.000000000 +0200
-+++ src/fb/Makefile.in 2004-04-07 12:47:51.000000000 +0200
-@@ -249,7 +249,7 @@
- stdctl.$(OBJEXT) post.$(OBJEXT) osd.$(OBJEXT) \
- config_wrapper.$(OBJEXT)
- fbxine_OBJECTS = $(am_fbxine_OBJECTS)
--fbxine_LDFLAGS =
-+fbxine_LDFLAGS = -Wl,-E
+ return buf;
+ }
+Index: src/xitk/main.c
+diff -Nau src/xitk/main.c.orig src/xitk/main.c
+--- src/xitk/main.c.orig 2004-04-20 14:16:18.000000000 +0200
++++ src/xitk/main.c 2004-04-20 14:16:23.000000000 +0200
+@@ -1181,12 +1181,6 @@
+ snprintf(buffer, sizeof(buffer), "%s", _("No Informations available."));
+ break;
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
+- case XINE_MSG_AUDIO_OUT_UNAVAILABLE:
+- gui_stop(NULL, NULL);
+- snprintf(buffer, sizeof(buffer), "%s", _("The audio device is unavailable. "
+- "Please verify if another program
already use it."));
+- break;
+-
+ default:
+ snprintf(buffer, sizeof(buffer), "%s", _("*sight*, unkown error."));
+ if(data->explanation)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xine-ui/xine-ui.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 xine-ui.spec
--- openpkg-src/xine-ui/xine-ui.spec 7 Apr 2004 13:37:14 -0000 1.19
+++ openpkg-src/xine-ui/xine-ui.spec 20 Apr 2004 12:29:55 -0000 1.20
@@ -33,8 +33,8 @@
Class: EVAL
Group: Video
License: GPL
-Version: 0.9.23
-Release: 20040407
+Version: 0.99.1
+Release: 20040420
# list of sources
Source0: http://download.sourceforge.net/xine/xine-ui-%{version}.tar.gz
@@ -45,8 +45,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, X11, gcc, sed
PreReq: OpenPKG, openpkg >= 20040130, X11
-BuildPreReq: xine-lib, libiconv, gettext, ncurses, curl, png
-PreReq: xine-lib, libiconv, gettext, ncurses, curl, png
+BuildPreReq: xine-lib, libiconv, gettext, readline, ncurses, curl, png
+PreReq: xine-lib, libiconv, gettext, readline, ncurses, curl, png
AutoReq: no
AutoReqProv: no
@@ -94,6 +94,7 @@
--with-xine-prefix=%{l_prefix} \
--with-curses \
--disable-mbs \
+ --with-readline=%{l_prefix} \
--with-curl-prefix=%{l_prefix} \
--with-png-prefix=%{l_prefix}
%{l_make} %{l_mflags -O} CPPFLAGS="%{l_cppflags ncurses}"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
