OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 20-Oct-2003 20:27:57
Branch: HEAD Handle: 2003102019275402
Modified files:
openpkg-re/vcheck vc.mozilla-mplayer
openpkg-src/mozilla-mplayer
mozilla-mplayer.patch mozilla-mplayer.spec
openpkg-web news.txt
Log:
upgrading package: mozilla-mplayer 0.95 -> 1.0p2t2
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-re/vcheck/vc.mozilla-mplayer
1.3 +10 -20 openpkg-src/mozilla-mplayer/mozilla-mplayer.patch
1.3 +16 -16 openpkg-src/mozilla-mplayer/mozilla-mplayer.spec
1.7087 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.mozilla-mplayer
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.mozilla-mplayer
--- openpkg-re/vcheck/vc.mozilla-mplayer 5 Oct 2003 18:08:02 -0000 1.1
+++ openpkg-re/vcheck/vc.mozilla-mplayer 20 Oct 2003 18:27:54 -0000 1.2
@@ -2,7 +2,7 @@
}
prog mozilla-mplayer = {
- version = 0.95
+ version = 1.0pre2-test2
url = http://prdownloads.sourceforge.net/mplayerplug-in/
regex = mplayerplug-in-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla-mplayer/mozilla-mplayer.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mozilla-mplayer.patch
--- openpkg-src/mozilla-mplayer/mozilla-mplayer.patch 12 Oct 2003 09:50:11 -0000
1.2
+++ openpkg-src/mozilla-mplayer/mozilla-mplayer.patch 20 Oct 2003 18:27:56 -0000
1.3
@@ -1,17 +1,7 @@
Index: Source/mplayerplug-in.c
---- Source/mplayerplug-in.c.orig 2003-10-03 16:54:52.000000000 +0200
-+++ Source/mplayerplug-in.c 2003-10-05 20:01:29.000000000 +0200
-@@ -28,6 +28,9 @@
- */
-
- #include "mplayerplug-in.h"
-+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
-+#endif
- pthread_mutex_t playlist_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-
- // This routine is only called when the plugin library is newer than the pluginrc
file
-@@ -71,7 +74,7 @@
+--- Source/mplayerplug-in.c.orig 2003-10-20 19:11:32.000000000 +0200
++++ Source/mplayerplug-in.c 2003-10-20 20:21:46.000000000 +0200
+@@ -70,7 +70,7 @@
}
if (config == NULL) {
@@ -20,7 +10,7 @@
}
if (config == NULL) {
-@@ -148,7 +151,7 @@
+@@ -147,7 +147,7 @@
}
if (customtypes == NULL) {
@@ -30,9 +20,9 @@
if (customtypes != NULL) {
Index: Source/support.c
---- Source/support.c.orig 2003-10-03 16:51:20.000000000 +0200
-+++ Source/support.c 2003-10-05 20:02:40.000000000 +0200
-@@ -114,7 +114,7 @@
+--- Source/support.c.orig 2003-10-20 19:11:32.000000000 +0200
++++ Source/support.c 2003-10-20 20:21:46.000000000 +0200
+@@ -113,7 +113,7 @@
}
if (config == NULL) {
@@ -42,9 +32,9 @@
if (config == NULL) {
Index: mplayerplug-in.types
---- mplayerplug-in.types.orig 2003-09-30 22:41:49.000000000 +0200
-+++ mplayerplug-in.types 2003-10-12 11:48:58.000000000 +0200
-@@ -31,4 +31,4 @@
+--- mplayerplug-in.types.orig 2003-10-17 18:28:13.000000000 +0200
++++ mplayerplug-in.types 2003-10-20 20:21:46.000000000 +0200
+@@ -32,4 +32,4 @@
audio/x-ms-wma:wma:Windows Media;
application/x-drm-v2:asx:Windows Media;
audio/wav:wav:Microsoft wave file;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mozilla-mplayer/mozilla-mplayer.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mozilla-mplayer.spec
--- openpkg-src/mozilla-mplayer/mozilla-mplayer.spec 12 Oct 2003 09:50:11 -0000
1.2
+++ openpkg-src/mozilla-mplayer/mozilla-mplayer.spec 20 Oct 2003 18:27:56 -0000
1.3
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_dist 1.0pre2-test2
+%define V_opkg 1.0p2t2
+
# package information
Name: mozilla-mplayer
Summary: Mozilla MPlayer Plugin
@@ -32,11 +36,11 @@
Distribution: OpenPKG [EVAL]
Group: Web
License: GPL
-Version: 0.95
-Release: 20031012
+Version: %{V_opkg}
+Release: 20031020
# list of sources
-Source0:
http://osdn.dl.sourceforge.net/mplayerplug-in/mplayerplug-in-%{version}.tar.gz
+Source0:
http://osdn.dl.sourceforge.net/mplayerplug-in/mplayerplug-in-%{V_dist}.tar.gz
Patch0: mozilla-mplayer.patch
# build information
@@ -58,19 +62,15 @@
%{l_shtool} subst %{l_value -s l_prefix} Source/*.c
%build
- cflags="%{l_cflags}"
- cflags="$cflags -DXP_UNIX -fPIC -I./include"
- cflags="$cflags -I`%{l_prefix}/etc/rc --query x11_incdir`"
- ldflags="%{l_ldflags}"
- ldflags="$ldflags -L`%{l_prefix}/etc/rc --query x11_libdir`"
- case "%{l_platform -t}" in
- *-freebsd4* ) ldflags="$ldflags -lc_r" ;;
- * ) ldflags="$ldflags -lpthread" ;;
- esac
- %{l_make} %{l_mflags -O} \
- CC="%{l_cc}" \
- CFLAGS="$cflags" \
- LDFLAGS="$ldflags"
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`"
\
+ LIBS="%{l_ldflags} -L`%{l_prefix}/etc/rc --query x11_libdir`" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-x \
+ --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+ --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir`
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7086 -r1.7087 news.txt
--- openpkg-web/news.txt 20 Oct 2003 15:49:01 -0000 1.7086
+++ openpkg-web/news.txt 20 Oct 2003 18:27:55 -0000 1.7087
@@ -1,3 +1,4 @@
+20-Oct-2003: Upgraded package: P<mozilla-mplayer-1.0p2t2-20031020>
20-Oct-2003: Upgraded package: P<dhcp-agent-0.41-20031020>
20-Oct-2003: Upgraded package: P<dcron-2.9-20031020>
20-Oct-2003: Upgraded package: P<fsl-1.3.0-20031020>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
