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

upgrade to mplayer 0.90rc4

Browse Source 
based on diff from MAINTAINER for 0.90rc3
This commit is contained in:
brad 2003-02-16 07:25:18 +00:00
parent 67147965c2
commit 6f08bc466e
11 changed files with 85 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
x11/mplayer/Makefile
View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.45 2003/01/21 23:07:38 sturm Exp $
# $OpenBSD: Makefile,v 1.46 2003/02/16 07:25:18 brad Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc sparc64
COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-0.90rc2
DISTNAME= MPlayer-0.90rc4
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p1
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -51,7 +52,7 @@ CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bi
--disable-alsa \
--disable-ossaudio \
--disable-arts \
--disable-dvdnav \
--disable-nas \
--enable-select \
--enable-vidix \
--enable-vorbis \
@ -142,11 +143,13 @@ pre-fetch:
@echo
. endif
RUN_DEPENDS+= win32/divx.dll:win32-codecs-*:graphics/win32-codecs
RUN_DEPENDS+= :win32-codecs-*:graphics/win32-codecs
BUILD_DEPENDS+= ${RUN_DEPENDS}
CONFIGURE_ARGS+=--with-win32libdir=${LOCALBASE}/lib/win32
CONFIGURE_ARGS+=--with-win32libdir=${LOCALBASE}/lib/win32 \
--enable-qtx-codecs
.else
CONFIGURE_ARGS+=--disable-win32
CONFIGURE_ARGS+=--disable-win32 \
--disable-qtx-codecs
.endif
.if ${FLAVOR:L:Mcdda}
@ -172,6 +175,10 @@ NO_REGRESS= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer/Skin/${SKIN}
${INSTALL_DATA} ${WRKDIR}/${SKIN}/* ${PREFIX}/share/mplayer/Skin/${SKIN}/
${INSTALL_DATA} ${WRKDIR}/${SKIN}/* ${PREFIX}/share/mplayer/Skin/${SKIN}
cd ${WRKDIST}/etc; ${INSTALL_DATA} input.conf menu.conf \
${PREFIX}/share/mplayer
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplayer
${INSTALL_DATA} ${WRKDIST}/DOCS/*.html ${PREFIX}/share/doc/mplayer
.include <bsd.port.mk>

6
x11/mplayer/distinfo
View File

@ -1,6 +1,6 @@
MD5 (mplayer/MPlayer-0.90rc2.tar.bz2) = b6b6d83276ac7086702ad62ead1bcfe5
MD5 (mplayer/MPlayer-0.90rc4.tar.bz2) = 4976575433d5b0ad526ca1733f5cab26
MD5 (mplayer/default-1.1.tar.bz2) = 95417702dbb28226a2b0a20139ddfd0b
RMD160 (mplayer/MPlayer-0.90rc2.tar.bz2) = ea6dad0e00f05fdfb3a319ca471397fe9292f29f
RMD160 (mplayer/MPlayer-0.90rc4.tar.bz2) = d0048f4be7395fc0eaad6a960b1da156b40e9c98
RMD160 (mplayer/default-1.1.tar.bz2) = bdcb3db26d6d5cc2ac8de3c0bd9ea40921e509a4
SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee
SHA1 (mplayer/MPlayer-0.90rc4.tar.bz2) = d9372956b3bdcc20df5b8a0bcc93a49ceb826d28
SHA1 (mplayer/default-1.1.tar.bz2) = 804d181e96c81e3794260dc8976786f3a535a3cf

13
x11/mplayer/patches/patch-Gui_cfg_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Gui_cfg_c,v 1.1 2003/02/16 07:25:18 brad Exp $
--- Gui/cfg.c.orig Thu Feb 13 18:24:35 2003
+++ Gui/cfg.c Thu Feb 13 18:25:35 2003
@@ -117,7 +117,9 @@ static config_t gui_opts[] =
{ "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
{ "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
{ "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL },
+#ifdef USE_ICONV
{ "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL },
+#endif
{ "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
{ "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
#ifdef HAVE_FREETYPE

15
x11/mplayer/patches/patch-TOOLS_subfont-c_subfont_c
View File

@ -1,15 +1,6 @@
$OpenBSD: patch-TOOLS_subfont-c_subfont_c,v 1.2 2002/10/28 17:56:08 espie Exp $
--- TOOLS/subfont-c/subfont.c.orig Sun Aug 18 10:21:24 2002
+++ TOOLS/subfont-c/subfont.c Mon Oct 28 18:44:53 2002
@@ -509,7 +509,7 @@ void outline(
int msize) {
int x, y;
-#if 1
+#if 0
for (y = 0; y<height; y++) {
for (x = 0; x<width; x++) {
const int src= s[x];
$OpenBSD: patch-TOOLS_subfont-c_subfont_c,v 1.3 2003/02/16 07:25:18 brad Exp $
--- TOOLS/subfont-c/subfont.c.orig Tue Jan 14 06:52:33 2003
+++ TOOLS/subfont-c/subfont.c Tue Jan 14 06:50:16 2003
@@ -834,6 +834,18 @@ unsigned gmatrix(unsigned *m, int r, int
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.18 2003/01/03 23:06:36 brad Exp $
--- configure.orig Mon Dec 23 01:33:05 2002
+++ configure Wed Dec 25 21:55:52 2002
@@ -3296,7 +3296,7 @@ echores "$_sgiaudio"
$OpenBSD: patch-configure,v 1.19 2003/02/16 07:25:18 brad Exp $
--- configure.orig Sat Feb 8 17:29:05 2003
+++ configure Thu Feb 13 16:58:25 2003
@@ -3414,7 +3414,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.18 2003/01/03 23:06:36 brad Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -3858,7 +3858,7 @@ fi
@@ -4019,7 +4019,7 @@ fi
echocheck "iconv"

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

@ -1,12 +1,12 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.3 2002/11/13 17:54:35 espie Exp $
--- libavcodec/Makefile.orig Sun Nov 10 22:59:44 2002
+++ libavcodec/Makefile Tue Nov 12 06:03:01 2002
@@ -103,7 +103,7 @@ tests: apiexample cpuid_test $(TESTS)
$(LIB): $(OBJS)
$OpenBSD: patch-libavcodec_Makefile,v 1.4 2003/02/16 07:25:18 brad Exp $
--- libavcodec/Makefile.orig Sat Feb 1 15:57:37 2003
+++ libavcodec/Makefile Thu Feb 13 16:58:25 2003
@@ -117,7 +117,7 @@ $(LIB): $(OBJS)
rm -f $@
$(AR) rc $@ $(OBJS)
ifneq ($(CONFIG_OS2),yes)
- $(RANLIB) $@
+# $(RANLIB) $@
endif
$(SLIB): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libmpdemux_stream_c,v 1.5 2002/10/14 09:50:48 pvalchev Exp $
--- libmpdemux/stream.c.orig Sun Aug 4 15:35:25 2002
+++ libmpdemux/stream.c Tue Sep 10 22:47:17 2002
@@ -22,7 +22,7 @@ extern int verbose; // defined in mplaye
$OpenBSD: patch-libmpdemux_stream_c,v 1.6 2003/02/16 07:25:18 brad Exp $
--- libmpdemux/stream.c.orig Sun Jan 12 21:16:28 2003
+++ libmpdemux/stream.c Mon Jan 20 00:35:46 2003
@@ -24,7 +24,7 @@ extern int verbose; // defined in mplaye
#ifdef HAVE_VCD

25
x11/mplayer/patches/patch-loader_wrapper_S
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
--- loader/wrapper.S.orig Sun Dec 8 21:11:05 2002
+++ loader/wrapper.S Sun Dec 8 21:11:19 2002
@@ -1,27 +1,32 @@
$OpenBSD: patch-loader_wrapper_S,v 1.2 2003/02/16 07:25:18 brad Exp $
--- loader/wrapper.S.orig Mon Nov 25 21:37:12 2002
+++ loader/wrapper.S Tue Jan 21 23:02:18 2003
@@ -1,27 +1,36 @@
+#include "../mangle.h"
+#if !defined(__OpenBSD__) && !defined(__ELF__)
+#if defined(__OpenBSD__) && !defined(__ELF__)
+.data
+#else
.section .data
-.globl caller_return
-caller_return:
@ -20,6 +22,7 @@ $OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
-.global wrapper_target
-wrapper_target:
- .long null_call
-
+.globl MANGLEA(report_entry)
+MANGLEA(report_entry):
+ .long MANGLEA(null_call)
@ -29,8 +32,10 @@ $OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
+.global MANGLEA(wrapper_target)
+MANGLEA(wrapper_target):
+ .long MANGLEA(null_call)
+#if !defined(__OpenBSD__) && !defined(__ELF__)
+
+#if defined(__OpenBSD__) && !defined(__ELF__)
+.text
+#else
.section .text
-.globl null_call
- .type null_call, @function
@ -51,7 +56,7 @@ $OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
pusha # store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI)
pushf # store flags
@@ -39,7 +44,7 @@ wrapper:
@@ -39,7 +48,7 @@ wrapper:
push %eax
push %edx
@ -60,7 +65,7 @@ $OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
test %eax, %eax
jnz .Ldone
@@ -48,14 +53,14 @@ wrapper:
@@ -48,14 +57,14 @@ wrapper:
popf # restore flags
popa # restore registers
@ -78,7 +83,7 @@ $OpenBSD: patch-loader_wrapper_S,v 1.1 2002/12/22 14:19:47 espie Exp $
pusha # more for reference sake here
pushf
@@ -73,7 +78,7 @@ wrapper:
@@ -73,7 +82,7 @@ wrapper:
push %eax
push %edx

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mp3lib_Makefile,v 1.4 2003/01/03 23:06:36 brad Exp $
--- mp3lib/Makefile.orig Tue Dec 24 01:05:43 2002
+++ mp3lib/Makefile Wed Dec 25 21:55:52 2002
@@ -43,9 +43,6 @@ libMP3.a: $(OBJS)
$OpenBSD: patch-mp3lib_Makefile,v 1.5 2003/02/16 07:25:18 brad Exp $
--- mp3lib/Makefile.orig Mon Jan 27 16:47:25 2003
+++ mp3lib/Makefile Thu Feb 13 16:58:25 2003
@@ -54,9 +54,6 @@ libMP3.a: $(OBJS)
ifeq ($(TARGET_OS),CYGWIN)
./mp3lib_objfix.sh
endif

10
x11/mplayer/patches/patch-mp3lib_dct64_k7_c
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-mp3lib_dct64_k7_c,v 1.5 2003/01/21 23:07:38 sturm Exp $
--- mp3lib/dct64_k7.c.orig Wed Nov 20 00:35:51 2002
+++ mp3lib/dct64_k7.c Sun Jan 19 01:05:19 2003
@@ -758,5 +758,5 @@ void __attribute__ (( __stdcall__ )) dct
" femms\n\t"
:
:"m"(a),"m"(b),"m"(c),"m"(tmp[0])
- :"memory","%ebx","%esi","%edi");
+ :"memory","%eax","%ebx","%ecx","%edx","%esi","%edi");
}

19
x11/mplayer/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2003/01/03 23:06:36 brad Exp $
@comment $OpenBSD: PLIST,v 1.5 2003/02/16 07:25:18 brad Exp $
bin/mencoder
bin/mplayer
lib/mplayer/vidix/cyberblade_vid.so
@ -12,7 +12,22 @@ lib/mplayer/vidix/rage128_vid.so
man/man1/mencoder.1
man/man1/mplayer.1
share/mplayer/codecs.conf
share/mplayer/input.conf
share/mplayer/menu.conf
share/doc/mplayer/bugreports.html
share/doc/mplayer/cd-dvd.html
share/doc/mplayer/codecs-in.html
share/doc/mplayer/codecs.html
share/doc/mplayer/documentation.html
share/doc/mplayer/encoding.html
share/doc/mplayer/faq.html
share/doc/mplayer/formats.html
share/doc/mplayer/skin.html
share/doc/mplayer/sound.html
share/doc/mplayer/users_against_developers.html
share/doc/mplayer/video.html
!%%no_x11%%
@exec rmdir share/mplayer 2>/dev/null || true
@unexec rmdir %D/share/mplayer 2>/dev/null || true
@dirrm share/doc/mplayer
@dirrm lib/mplayer/vidix
@dirrm lib/mplayer