[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: UPDATE: mplayer to 1.0pre5

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: Re: UPDATE: mplayer to 1.0pre5
From: Robert Nagy <robert_(_at_)_openbsd_(_dot_)_org>
Date: Thu, 15 Jul 2004 02:42:35 +0200
This fixed diff will work fine:

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile	3 Jul 2004 02:10:26 -0000	1.73
+++ Makefile	15 Jul 2004 00:41:09 -0000
@@ -5,9 +5,9 @@
 
 COMMENT=		"Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
 
-DISTNAME=		MPlayer-1.0pre4
+DISTNAME=		MPlayer-1.0pre5
 DIST_SUBDIR=		mplayer
-PKGNAME=		${DISTNAME:L}p1
+PKGNAME=		${DISTNAME:L}
 CATEGORIES=		x11
 EXTRACT_SUFX=		.tar.bz2
 
@@ -27,14 +27,11 @@
 #MASTER_SITES0=		http://www2.mplayerhq.hu/MPlayer/Skin/
 MASTER_SITES0=		http://www.sightly.net/mplayer/
 
-MASTER_SITES1=		${MASTER_SITES:S,releases,patches,}
-
 MAINTAINER=     Bjorn Sandell <biorn_(_at_)_dce_(_dot_)_chalmers_(_dot_)_se>
 
 SKIN=		default
 SKINVER=	1.7
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SKIN}-${SKINVER}${EXTRACT_SUFX}:0
-PATCHFILES+=	vuln04-fix.diff:1
 
 .include <bsd.own.mk>
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo	3 Jul 2004 02:10:26 -0000	1.20
+++ distinfo	15 Jul 2004 00:41:09 -0000
@@ -1,9 +1,6 @@
-MD5 (mplayer/MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
+MD5 (mplayer/MPlayer-1.0pre5.tar.bz2) = fbe6919eb025526e8ed129cd61a49969
 MD5 (mplayer/default-1.7.tar.bz2) = 7e1d16c2f8a32469f4354cb043eecc5d
-MD5 (mplayer/vuln04-fix.diff) = 4e5c1984d56d2c5f3bfd3a086df4f80c
-RMD160 (mplayer/MPlayer-1.0pre4.tar.bz2) = 1984c2ab360c080d2752fe834d4abb91b479005f
+RMD160 (mplayer/MPlayer-1.0pre5.tar.bz2) = 9097f188b2c26b7cff1106fe22f6a0c656fc4af2
 RMD160 (mplayer/default-1.7.tar.bz2) = 5f78ff9db296d8fd53ef6603ec8a227eeb602dd1
-RMD160 (mplayer/vuln04-fix.diff) = 889d7d51347de25d9f1bb21d4f3866c893355a32
-SHA1 (mplayer/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702
+SHA1 (mplayer/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307
 SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
-SHA1 (mplayer/vuln04-fix.diff) = 8aeb8b168ca9339634e8a23d1821a79369872362
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-Makefile,v
retrieving revision 1.8
diff -u -r1.8 patch-Makefile
--- patches/patch-Makefile	6 May 2004 07:27:49 -0000	1.8
+++ patches/patch-Makefile	15 Jul 2004 00:41:09 -0000
@@ -1,16 +1,16 @@
-$OpenBSD: patch-Makefile,v 1.8 2004/05/06 07:27:49 biorn Exp $
---- Makefile.orig	2004-04-13 13:22:37.000000000 +0200
-+++ Makefile	2004-04-28 12:24:12.000000000 +0200
-@@ -229,7 +229,7 @@ mplayer_wine.so:	$(MPLAYER_DEP)
+$OpenBSD$
+--- Makefile.orig	Fri Jul  9 19:32:17 2004
++++ Makefile	Wed Jul 14 15:30:33 2004
+@@ -224,7 +224,7 @@
+ 
  ifeq ($(MENCODER),yes)
  $(PRG_MENCODER): $(MENCODER_DEP)
- 	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
 -	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
 +	$(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
  endif
  
  codecs.conf.h: $(PRG_CFG) etc/codecs.conf
-@@ -287,8 +287,6 @@ ifeq ($(GUI),yes)
+@@ -282,8 +282,6 @@
  	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html";
  	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
  endif
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	22 Jun 2004 08:13:11 -0000	1.27
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-configure,v 1.27 2004/06/22 08:13:11 brad Exp $
---- configure.orig	2004-04-26 05:44:06.000000000 -0400
-+++ configure	2004-05-28 22:12:05.000000000 -0400
-@@ -440,7 +440,7 @@ if test -z "$_target" ; then
-       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
-       ia64) host_arch=ia64 ;;
-       x86_64|amd64) host_arch=x86_64 ;;
--      ppc) host_arch=ppc ;;
-+      macppc|ppc) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-       sparc*) host_arch=sparc ;;
-       parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -4148,7 +4148,7 @@ echores "$_sgiaudio"
- 
- 
- echocheck "VCD support"
--if linux || bsdos || freebsd || netbsd || sunos ; then
-+if linux || bsdos || freebsd || netbsd || openbsd || sunos ; then
-   _inputmodules="vcd $_inputmodules"
-   _def_vcd='#define HAVE_VCD 1'
-   echores "ok"
-@@ -4991,7 +4991,7 @@ fi
- 
- 
- echocheck "iconv"
--if test "$_iconv" = auto ; then
-+if test "$_iconv" != no ; then
-   _iconv_tmp='#include <iconv.h>'
- 
-   cat > $TMPC << EOF
-@@ -6459,6 +6459,9 @@ $_def_vcd
- #elif defined(SYS_DARWIN)
- #define DEFAULT_CDROM_DEVICE    "/dev/rdiskN"
- #define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-+#elif defined(__OpenBSD__)
-+#define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
-+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
- #else
- #define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
- #define DEFAULT_DVD_DEVICE	"/dev/dvd"
Index: patches/patch-libmpdemux_demux_real_c
===================================================================
RCS file: patches/patch-libmpdemux_demux_real_c
diff -N patches/patch-libmpdemux_demux_real_c
--- patches/patch-libmpdemux_demux_real_c	6 May 2004 07:27:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_real_c,v 1.1 2004/05/06 07:27:49 biorn Exp $
---- libmpdemux/demux_real.c.orig	2004-05-02 09:30:54.000000000 +0200
-+++ libmpdemux/demux_real.c	2004-05-02 09:30:59.000000000 +0200
-@@ -1193,10 +1193,6 @@ void demux_open_real(demuxer_t* demuxer)
- 		    sh->wf->cbSize = 0;
- 		    sh->format = MKTAG(buf[0], buf[1], buf[2], buf[3]);
- 
--		    if ((version != 3) && (hdr_size != 0x4e)) {
--		    	mp_msg(MSGT_DEMUX,MSGL_V,"skipping %d extra header bytes\n", hdr_size-0x4e);
--		    	stream_skip(demuxer->stream, hdr_size-0x4e);
--		    }
- #if 0
- 		    switch (sh->format){
- 			case MKTAG('d', 'n', 'e', 't'):
Index: patches/patch-libmpdemux_stream_vcd_c
===================================================================
RCS file: patches/patch-libmpdemux_stream_vcd_c
diff -N patches/patch-libmpdemux_stream_vcd_c
--- patches/patch-libmpdemux_stream_vcd_c	2 Nov 2003 23:30:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpdemux_stream_vcd_c,v 1.1 2003/11/02 23:30:27 brad Exp $
---- libmpdemux/stream_vcd.c.orig	2003-09-02 22:07:48.000000000 +0200
-+++ libmpdemux/stream_vcd.c	2003-09-02 22:09:21.000000000 +0200
-@@ -17,7 +17,7 @@
- #ifdef __FreeBSD__
- #include <sys/cdrio.h>
- #include "vcd_read_fbsd.h" 
--#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__) || defined (__OpenBSD__)
- #include "vcd_read_nbsd.h" 
- #else
- #include "vcd_read.h"
Index: patches/patch-libmpdemux_vcd_read_nbsd_h
===================================================================
RCS file: patches/patch-libmpdemux_vcd_read_nbsd_h
diff -N patches/patch-libmpdemux_vcd_read_nbsd_h
--- patches/patch-libmpdemux_vcd_read_nbsd_h	2 Nov 2003 23:30:27 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpdemux_vcd_read_nbsd_h,v 1.3 2003/11/02 23:30:27 brad Exp $
---- libmpdemux/vcd_read_nbsd.h.orig	2003-04-09 03:33:59.000000000 -0400
-+++ libmpdemux/vcd_read_nbsd.h	2003-10-28 18:03:39.000000000 -0500
-@@ -1,6 +1,8 @@
- 
- #include <sys/types.h>
-+#ifdef __NetBSD__
- #include <sys/inttypes.h>
-+#endif
- #include <sys/cdio.h>
- #include <sys/scsiio.h>
- 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/mplayer/pkg/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- pkg/PLIST	22 Jun 2004 08:13:12 -0000	1.13
+++ pkg/PLIST	15 Jul 2004 00:41:09 -0000
@@ -31,7 +31,7 @@
 share/doc/mplayer/gui.html
 share/doc/mplayer/history.html
 share/doc/mplayer/howtoread.html
-share/doc/mplayer/hpux.html
+share/doc/mplayer/hp-ux.html
 share/doc/mplayer/index.html
 share/doc/mplayer/install.html
 share/doc/mplayer/intro.html
@@ -40,13 +40,13 @@
 share/doc/mplayer/linux.html
 share/doc/mplayer/macos.html
 share/doc/mplayer/mailinglists.html
-share/doc/mplayer/menc-feat-divx4.html
 share/doc/mplayer/menc-feat-dvd-mpeg4.html
 share/doc/mplayer/menc-feat-enc-images.html
 share/doc/mplayer/menc-feat-enc-libavcodec.html
 share/doc/mplayer/menc-feat-extractsub.html
 share/doc/mplayer/menc-feat-fix-avi.html
 share/doc/mplayer/menc-feat-mpeg.html
+share/doc/mplayer/menc-feat-mpeg4.html
 share/doc/mplayer/menc-feat-rescale.html
 share/doc/mplayer/menc-feat-streamcopy.html
 share/doc/mplayer/menc-feat-telecine.html
References:
- UPDATE: mplayer to 1.0pre5
  - From: Robert Nagy
- Re: UPDATE: mplayer to 1.0pre5
  - From: Robert Nagy
Prev by Date: problem making stunnel
Next by Date: Re: ORBit broken on amd64?
Previous by thread: Re: UPDATE: mplayer to 1.0pre5
Next by thread: Re: ORBit broken on amd64?
Index(es):
- Date
- Thread
Visit your host, monkey.org