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

Update to 0.90pre5

Browse Source 
Most work by Biorn, some testing by pval and me.
This commit is contained in:
espie 2002-06-27 22:03:49 +00:00
parent c45b782429
commit f1c812e4fc
14 changed files with 70 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/mplayer/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2002/06/15 05:11:31 pvalchev Exp $
# $OpenBSD: Makefile,v 1.21 2002/06/27 22:03:49 espie Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc sparc64
COMMENT= "Movie player"
DISTNAME= MPlayer-0.90pre4
DISTNAME= MPlayer-0.90pre5
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
NEED_VERSION= 1.527
@ -21,6 +21,8 @@ MASTER_SITES= http://www2.mplayerhq.hu/MPlayer/releases/
#MASTER_SITES0= http://www2.mplayerhq.hu/MPlayer/Skin/
MASTER_SITES0= http://www.sightly.net/mplayer/
MAINTAINER= Björn Sandell <biorn@dce.chalmers.se>
SKIN= default
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKIN}${EXTRACT_SUFX}:0
@ -48,6 +50,7 @@ CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bi
--disable-vorbis \
--disable-aa \
--disable-ossaudio \
--disable-arts \
--enable-select \
--enable-gl \
--enable-gui \
@ -65,7 +68,7 @@ FLAVOR?=
.if ${FLAVOR:L:Msdl}
CONFIGURE_ARGS+=--enable-sdl \
--with-sdl-config=${LOCALBASE}/bin/sdl-config
LIB_DEPENDS+= SDL:sdl-1.2.4p1,>=1.2.5-*:devel/sdl
LIB_DEPENDS+= SDL:sdl>=1.2.4p1:devel/sdl
.else
CONFIGURE_ARGS+=--disable-sdl
.endif
@ -100,7 +103,7 @@ pre-fetch:
.if ${MACHINE_ARCH} != i386
@echo
@echo "Sorry, this CPU does not support Win32 codec DLLs,"
@echo "and you cannot use the win32 flavor."
@echo "and you cannot use the win32 flavor.
@echo
@exit 1
.else

6
x11/mplayer/distinfo
View File

@ -1,6 +1,6 @@
MD5 (MPlayer-0.90pre4.tar.bz2) = 987436bd5f94a718d4813a6c69f07625
MD5 (MPlayer-0.90pre5.tar.bz2) = e5655c304af41b23701653eb7a810d3f
MD5 (default.tar.bz2) = 8134215252ada2429f6d9456725c713f
RMD160 (MPlayer-0.90pre4.tar.bz2) = c4a711c963a5512a3f95e8fe6e819b534a75cfaf
RMD160 (MPlayer-0.90pre5.tar.bz2) = 5a1a72b1101931364904f5f4aef7d5ed0e7ca4f2
RMD160 (default.tar.bz2) = 0915e1b38037edbfac2cdeb5bc4220760ee80598
SHA1 (MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
SHA1 (MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
SHA1 (default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d

36
x11/mplayer/patches/patch-Gui_skin_skin_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
--- Gui/skin/skin.c.orig Wed May 15 17:57:43 2002
+++ Gui/skin/skin.c Wed May 15 17:57:47 2002
@@ -76,7 +76,7 @@ int skinBPRead( char * fname, txSample *
$OpenBSD: patch-Gui_skin_skin_c,v 1.2 2002/06/27 22:03:49 espie Exp $
--- Gui/skin/skin.c.orig Tue May 28 16:12:33 2002
+++ Gui/skin/skin.c Wed Jun 12 16:08:20 2002
@@ -74,7 +74,7 @@ int skinBPRead( char * fname, txSample *
return i;
}
@ -10,7 +10,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
strlower( in );
defList=NULL;
@@ -85,7 +85,7 @@ int __section( char * in )
@@ -83,7 +83,7 @@ int __section( char * in )
return 0;
}
@ -19,7 +19,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
if ( strlen( winList ) ) winList[0]=0;
else defList=NULL;
@@ -93,7 +93,7 @@ int __end( char * in )
@@ -91,7 +91,7 @@ int __end( char * in )
return 0;
}
@ -28,7 +28,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
CHECKDEFLIST( "window" );
@@ -103,7 +103,7 @@ int __window( char * in )
@@ -101,7 +101,7 @@ int __window( char * in )
return 0;
}
@ -37,7 +37,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -187,7 +187,7 @@ int __base( char * in )
@@ -188,7 +188,7 @@ int __base( char * in )
return 0;
}
@ -46,7 +46,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
CHECKDEFLIST( "background" );
CHECKWINLIST( "background" );
@@ -202,7 +202,7 @@ int __background( char * in )
@@ -203,7 +203,7 @@ int __background( char * in )
return 0;
}
@ -55,7 +55,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -245,7 +245,7 @@ int __button( char * in )
@@ -246,7 +246,7 @@ int __button( char * in )
return 0;
}
@ -64,7 +64,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -264,7 +264,7 @@ int __selected( char * in )
@@ -265,7 +265,7 @@ int __selected( char * in )
return 0;
}
@ -73,7 +73,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{ // menu = number,x,y,sx,sy,msg
int x,y,sx,sy,msg;
unsigned char tmp[64];
@@ -296,7 +296,7 @@ int __menu( char * in )
@@ -297,7 +297,7 @@ int __menu( char * in )
return 0;
}
@ -82,7 +82,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{ // hpotmeter=buttonbitmaps,sx,sy,phasebitmaps,phases,default value,x,y,sx,sy,msg
int x,y,psx,psy,ph,sx,sy,msg,d;
unsigned char tmp[512];
@@ -353,7 +353,7 @@ int __hpotmeter( char * in )
@@ -354,7 +354,7 @@ int __hpotmeter( char * in )
return 0;
}
@ -91,7 +91,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{ // potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
int x,y,ph,sx,sy,msg,d;
unsigned char tmp[512];
@@ -396,7 +396,7 @@ int __potmeter( char * in )
@@ -397,7 +397,7 @@ int __potmeter( char * in )
return 0;
}
@ -100,7 +100,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{ // font=fontname,fontid
char name[512];
char id[512];
@@ -432,7 +432,7 @@ int __font( char * in )
@@ -426,7 +426,7 @@ int __font( char * in )
return 0;
}
@ -109,7 +109,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
char tmp[512];
char sid[63];
@@ -466,7 +466,7 @@ int __slabel( char * in )
@@ -460,7 +460,7 @@ int __slabel( char * in )
return 0;
}
@ -118,7 +118,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{ // dlabel=x,y,sx,align,fontid,string ...
char tmp[512];
char sid[63];
@@ -502,7 +502,7 @@ int __dlabel( char * in )
@@ -496,7 +496,7 @@ int __dlabel( char * in )
return 0;
}
@ -127,7 +127,7 @@ $OpenBSD: patch-Gui_skin_skin_c,v 1.1 2002/06/08 02:07:37 drahn Exp $
{
char tmp[512];
@@ -527,20 +527,20 @@ typedef struct
@@ -521,20 +521,20 @@ typedef struct
_item skinItem[] =
{

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

@ -1,19 +0,0 @@
$OpenBSD: patch-Makefile,v 1.2 2002/05/15 22:27:01 pvalchev Exp $
--- Makefile.orig Sun May 12 03:07:24 2002
+++ Makefile Wed May 15 11:14:53 2002
@@ -223,13 +223,13 @@ endif
if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
ifeq ($(GUI),yes)
- -ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+ -ln -sf $(PRG) $(BINDIR)/gmplayer
endif
if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
ifeq ($(MENCODER),yes)
$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- -ln -sf $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1
+ -ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
endif
@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
@if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
--- configure.orig Mon May 13 22:52:10 2002
+++ configure Thu May 16 15:49:14 2002
@@ -1538,7 +1538,7 @@ else
$OpenBSD: patch-configure,v 1.11 2002/06/27 22:03:49 espie Exp $
--- configure.orig Sat Jun 8 00:41:25 2002
+++ configure Mon Jun 17 20:17:52 2002
@@ -1611,7 +1611,7 @@ else
fi
echores "$_sys_soundcard"
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
echocheck "soundcard.h"
cat > $TMPC << EOF
#include <soundcard.h>
@@ -2591,6 +2591,7 @@ if test "$_ossaudio" = yes ; then
@@ -2720,6 +2720,7 @@ if test "$_ossaudio" = yes ; then
else
if netbsd || openbsd ; then
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
else
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
fi
@@ -2720,7 +2721,7 @@ echores "$_sgiaudio"
@@ -2875,7 +2876,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -27,7 +27,16 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -3103,7 +3104,7 @@ EOF
@@ -2888,7 +2889,7 @@ fi
echocheck "DVD support (libmpdvdkit)"
if test "$_dvdkit" = auto ; then
_dvdkit=no
- if linux || freebsd || netbsd ; then
+ if linux || freebsd || netbsd || openbsd; then
test -f "./libmpdvdkit/Makefile" && _dvdkit=yes
fi
fi
@@ -3258,7 +3259,7 @@ EOF
_iconv=no
if freebsd ; then
cc_check -lm -lgiconv && _iconv=yes
@ -36,7 +45,7 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
cc_check -lm -liconv && _iconv=yes
else
cc_check -lm && _iconv=yes
@@ -3113,6 +3114,7 @@ if test "$_iconv" = yes ; then
@@ -3268,6 +3269,7 @@ if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
freebsd && _ld_iconv='-lgiconv'
bsdos && _ld_iconv='-liconv'
@ -44,7 +53,7 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
else
_def_iconv='#undef USE_ICONV'
fi
@@ -3614,7 +3616,6 @@ test "$_xanim" = yes && _ld_dl_dynamic='
@@ -3778,7 +3780,6 @@ test "$_xanim" = yes && _ld_dl_dynamic='
_ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
bsdos && _ld_arch="$_ld_arch -ldvd"
if netbsd || openbsd ; then
@ -52,7 +61,7 @@ $OpenBSD: patch-configure,v 1.10 2002/06/04 11:35:09 espie Exp $
x86 && _ld_arch="$_ld_arch -li386"
fi
@@ -3683,10 +3684,10 @@ cat > config.mak << EOF
@@ -3847,10 +3848,10 @@ cat > config.mak << EOF
LANG = C
TARGET_OS = $system_name

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

@ -1,6 +1,6 @@
$OpenBSD: patch-libdha_Makefile,v 1.5 2002/05/15 22:27:01 pvalchev Exp $
--- libdha/Makefile.orig Sun May 12 04:18:50 2002
+++ libdha/Makefile Wed May 15 00:45:06 2002
$OpenBSD: patch-libdha_Makefile,v 1.6 2002/06/27 22:03:49 espie Exp $
--- libdha/Makefile.orig Sat Jun 1 00:41:01 2002
+++ libdha/Makefile Wed Jun 12 16:09:48 2002
@@ -7,9 +7,13 @@ VERSION = 0.1
ifeq ($(TARGET_OS),CYGWIN)
SHORTNAME = libdha.dll
@ -41,8 +41,8 @@ $OpenBSD: patch-libdha_Makefile,v 1.5 2002/05/15 22:27:01 pvalchev Exp $
+all: $(LIBNAME)
pci_names.c:
gzip -d -c oth/pci.db.gz >pci.db
@@ -55,8 +60,8 @@ depend:
$(AWK) -f pci_db2c.awk oth/pci.db
@@ -54,8 +59,8 @@ depend:
install:
mkdir -p $(prefix)/lib
install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-libmpdemux_stream_c,v 1.2 2002/06/04 11:26:17 espie Exp $
--- libmpdemux/stream.c.orig Sun May 5 18:22:59 2002
+++ libmpdemux/stream.c Tue Jun 4 13:22:41 2002
$OpenBSD: patch-libmpdemux_stream_c,v 1.3 2002/06/27 22:03:49 espie Exp $
--- libmpdemux/stream.c.orig Tue Jun 4 21:17:52 2002
+++ libmpdemux/stream.c Thu Jun 13 00:04:08 2002
@@ -20,11 +20,10 @@ extern int verbose; // defined in mplaye
#ifdef HAVE_VCD
@ -14,11 +14,3 @@ $OpenBSD: patch-libmpdemux_stream_c,v 1.2 2002/06/04 11:26:17 espie Exp $
#include "vcd_read.h"
#endif
@@ -260,6 +259,7 @@ void free_stream(stream_t *s){
waitpid(s->cache_pid,NULL,0);
}
if(s->priv) free(s->priv);
+ close(s->fd);
free(s);
}

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

@ -1,12 +0,0 @@
$OpenBSD: patch-libmpdemux_vcd_read_nbsd_h,v 1.1 2002/05/16 11:58:48 espie Exp $
--- libmpdemux/vcd_read_nbsd.h.orig Thu May 16 00:44:49 2002
+++ libmpdemux/vcd_read_nbsd.h Thu May 16 00:44:59 2002
@@ -1,6 +1,8 @@
#include <sys/types.h>
+#if defined(__NetBSD__)
#include <sys/inttypes.h>
+#endif
#include <sys/cdio.h>
#include <sys/scsiio.h>

16
x11/mplayer/patches/patch-libvo_x11_common_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-libvo_x11_common_c,v 1.2 2002/06/04 11:26:17 espie Exp $
--- libvo/x11_common.c.orig Mon May 13 22:45:42 2002
+++ libvo/x11_common.c Sat May 18 23:16:22 2002
@@ -588,10 +588,11 @@ int vo_x11_check_events(Display *mydispl
{
Window root;
int foo;
+ Window win;
XGetGeometry(mydisplay, vo_window, &root, &foo, &foo,
&foo/*width*/, &foo/*height*/, &foo, &foo);
XTranslateCoordinates(mydisplay, vo_window, root, 0, 0,
- &vo_dx, &vo_dy, (Window *)&foo);
+ &vo_dx, &vo_dy, (Window *)&win);
}
#endif
ret|=VO_EVENT_RESIZE;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mp3lib_dct64_3dnow_c,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- mp3lib/dct64_3dnow.c.orig Fri May 3 20:32:37 2002
+++ mp3lib/dct64_3dnow.c Fri May 3 20:37:12 2002
@@ -509,7 +509,7 @@ void __attribute__ (( __stdcall__ )) dct
$OpenBSD: patch-mp3lib_dct64_3dnow_c,v 1.2 2002/06/27 22:03:49 espie Exp $
--- mp3lib/dct64_3dnow.c.orig Fri May 24 03:56:01 2002
+++ mp3lib/dct64_3dnow.c Wed Jun 12 23:13:17 2002
@@ -504,7 +504,7 @@ void __attribute__ (( __stdcall__ )) dct
" movd "MANGLE(plus_1f)", %%mm6\n\t"
" punpckldq 120(%%ebx), %%mm6\n\t" /* mm6 = 1.0 | 120(%%ebx)*/

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mp3lib_dct64_k7_c,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- mp3lib/dct64_k7.c.orig Fri May 3 20:35:39 2002
+++ mp3lib/dct64_k7.c Fri May 3 20:36:10 2002
@@ -387,7 +387,7 @@ void __attribute__ (( __stdcall__ )) dct
$OpenBSD: patch-mp3lib_dct64_k7_c,v 1.2 2002/06/27 22:03:49 espie Exp $
--- mp3lib/dct64_k7.c.orig Fri May 24 03:56:01 2002
+++ mp3lib/dct64_k7.c Wed Jun 12 23:13:35 2002
@@ -382,7 +382,7 @@ void __attribute__ (( __stdcall__ )) dct
" movd "MANGLE(plus_1f)", %%mm6\n\t"
" punpckldq 120(%%ebx), %%mm6\n\t" /* mm6 = 1.0 | 120(%%ebx)*/

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

@ -1,12 +0,0 @@
$OpenBSD: patch-postproc_yuv2rgb_c,v 1.1 2002/05/18 17:50:19 art Exp $
--- postproc/yuv2rgb.c.orig Thu May 16 00:57:29 2002
+++ postproc/yuv2rgb.c Thu May 16 00:57:37 2002
@@ -407,7 +407,7 @@ static void yuv2rgb_c_init (int bpp, int
uint32_t *table_32 = 0;
uint16_t *table_16 = 0;
uint8_t *table_8 = 0;
- uint32_t entry_size = 0;
+ int entry_size = 0;
void *table_r = 0, *table_g = 0, *table_b = 0;
int crv = Inverse_Table_6_9[matrix_coefficients][0];

14
x11/mplayer/patches/patch-vidix_drivers_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-vidix_drivers_Makefile,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- vidix/drivers/Makefile.orig Wed Apr 24 21:58:33 2002
+++ vidix/drivers/Makefile Wed May 8 18:16:43 2002
$OpenBSD: patch-vidix_drivers_Makefile,v 1.2 2002/06/27 22:03:49 espie Exp $
--- vidix/drivers/Makefile.orig Sat Jun 1 01:17:43 2002
+++ vidix/drivers/Makefile Wed Jun 12 23:18:33 2002
@@ -3,6 +3,7 @@
include ../../config.mak
@ -9,12 +9,12 @@ $OpenBSD: patch-vidix_drivers_Makefile,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Ex
RADEON_VID=radeon_vid.so
@@ -109,7 +110,7 @@ depend:
@@ -121,7 +122,7 @@ depend:
install:
mkdir -p $(BINDIR)
- install -m 755 -s -p *.so $(BINDIR)
+ install -m 755 -p *.so $(BINDIR)
#
# include dependency files if they exist
#
uninstall:
rm -f $(BINDIR)/*.so
rmdir -p --ignore-fail-on-non-empty $(BINDIR)

14
x11/mplayer/patches/patch-vidix_vidixlib_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-vidix_vidixlib_c,v 1.2 2002/05/12 08:16:24 pvalchev Exp $
--- vidix/vidixlib.c.orig Sun May 12 01:24:01 2002
+++ vidix/vidixlib.c Sun May 12 01:24:58 2002
@@ -24,6 +24,10 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include <dirent.h>
+#if defined(__OpenBSD__) && !defined(__ELF__)
+#define dlsym(h,s) dlsym(h, "_" s)
+#endif
+
#include "vidixlib.h"
#include "../bswap.h"