cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take it to 1.0pre4

Browse Source 
ok brad@
This commit is contained in:
biorn 2004-05-06 07:27:36 +00:00
parent dd5aab7bae
commit 7a365f9f2c
7 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/mplayer/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.68 2004/03/30 21:05:57 biorn Exp $
# $OpenBSD: Makefile,v 1.69 2004/05/06 07:27:36 biorn Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc amd64
COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-1.0pre3
DISTNAME= MPlayer-1.0pre4
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p0
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -53,6 +53,7 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-ossaudio \
--disable-nas \
--disable-liblzo \
--disable-caca \
--enable-runtime-cpudetection \
--enable-select \
--enable-vidix \

6
x11/mplayer/distinfo
View File

@ -1,6 +1,6 @@
MD5 (mplayer/MPlayer-1.0pre3.tar.bz2) = 998becb79417c6a14d15c07e85188b82
MD5 (mplayer/MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
MD5 (mplayer/default-1.7.tar.bz2) = 7e1d16c2f8a32469f4354cb043eecc5d
RMD160 (mplayer/MPlayer-1.0pre3.tar.bz2) = ea27a37f55729271a6d6cae79f84be9f2cc912d3
RMD160 (mplayer/MPlayer-1.0pre4.tar.bz2) = 1984c2ab360c080d2752fe834d4abb91b479005f
RMD160 (mplayer/default-1.7.tar.bz2) = 5f78ff9db296d8fd53ef6603ec8a227eeb602dd1
SHA1 (mplayer/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
SHA1 (mplayer/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702
SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3

8
x11/mplayer/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2003/12/16 17:17:33 biorn Exp $
--- Makefile.orig 2003-12-08 22:33:31.000000000 +0100
+++ Makefile 2003-12-09 14:32:23.000000000 +0100
$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)
ifeq ($(MENCODER),yes)
$(PRG_MENCODER): $(MENCODER_DEP)
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.7 2003/12/16 17:17:33 biorn Exp $
+ $(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)
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
@@ -287,8 +287,6 @@ ifeq ($(GUI),yes)
@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/Skin/"

21
x11/mplayer/patches/patch-configure
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-configure,v 1.25 2004/03/04 12:57:45 avsm Exp $
--- configure.orig 2003-12-08 21:33:31.000000000 +0000
+++ configure 2004-03-04 12:53:03.000000000 +0000
@@ -431,7 +431,7 @@ if test -z "$_target" ; then
case "`( uname -m ) 2>&1`" in
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) host_arch=x86_64 ;;
+ x86_64|amd64) host_arch=x86_64 ;;
ppc) host_arch=ppc ;;
alpha) host_arch=alpha ;;
sparc*) host_arch=sparc ;;
@@ -4020,7 +4020,7 @@ echores "$_sgiaudio"
$OpenBSD: patch-configure,v 1.26 2004/05/06 07:27:49 biorn Exp $
--- configure.orig 2004-04-26 11:44:06.000000000 +0200
+++ configure 2004-04-28 12:24:12.000000000 +0200
@@ -4148,7 +4148,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -19,7 +10,7 @@ $OpenBSD: patch-configure,v 1.25 2004/03/04 12:57:45 avsm Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -4826,7 +4826,7 @@ fi
@@ -4991,7 +4991,7 @@ fi
echocheck "iconv"
@ -28,7 +19,7 @@ $OpenBSD: patch-configure,v 1.25 2004/03/04 12:57:45 avsm Exp $
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
@@ -6298,6 +6298,9 @@ $_def_vcd
@@ -6459,6 +6459,9 @@ $_def_vcd
#elif defined(SYS_DARWIN)
#define DEFAULT_CDROM_DEVICE "/dev/rdiskN"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE

14
x11/mplayer/patches/patch-libmpdemux_demux_real_c Normal file
View File

@ -0,0 +1,14 @@
$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'):

12
x11/mplayer/patches/patch-libmpdemux_http_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libmpdemux_http_c,v 1.1 2004/03/30 21:06:17 biorn Exp $
--- libmpdemux/http.c.orig 2004-03-30 21:59:15.000000000 +0200
+++ libmpdemux/http.c 2004-03-30 22:00:20.000000000 +0200
@@ -175,7 +175,7 @@ http_build_request( HTTP_header_t *http_
if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET");
if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/");
else {
- uri = (char*)malloc(strlen(http_hdr->uri)*2);
+ uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1);
if( uri==NULL ) {
mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
return NULL;

6
x11/mplayer/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2003/12/16 17:17:39 biorn Exp $
@comment $OpenBSD: PLIST,v 1.12 2004/05/06 07:27:49 biorn Exp $
bin/mencoder
bin/mplayer
lib/mplayer/vidix/cyberblade_vid.so
@ -13,6 +13,7 @@ lib/mplayer/vidix/sis_vid.so
%%SHARED%%
man/man1/mencoder.1
man/man1/mplayer.1
share/doc/mplayer/amiga.html
share/doc/mplayer/aspect.html
share/doc/mplayer/bsd.html
share/doc/mplayer/bugreports.html
@ -40,6 +41,7 @@ share/doc/mplayer/gcc-296.html
share/doc/mplayer/gui.html
share/doc/mplayer/history.html
share/doc/mplayer/howtoread.html
share/doc/mplayer/hpux.html
share/doc/mplayer/index.html
share/doc/mplayer/install.html
share/doc/mplayer/intro.html
@ -49,6 +51,7 @@ 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
@ -56,6 +59,7 @@ share/doc/mplayer/menc-feat-fix-avi.html
share/doc/mplayer/menc-feat-mpeg.html
share/doc/mplayer/menc-feat-rescale.html
share/doc/mplayer/menc-feat-streamcopy.html
share/doc/mplayer/menc-feat-telecine.html
share/doc/mplayer/mencoder.html
share/doc/mplayer/mplayer-binary.html
share/doc/mplayer/mpst.html