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

Update to 0.90pre6, mostly from maintainer.

Browse Source
This commit is contained in:
espie 2002-08-18 11:26:48 +00:00
parent 493e81573e
commit 5e87cd8588
11 changed files with 44 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/mplayer/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.27 2002/08/16 19:20:54 pvalchev Exp $
# $OpenBSD: Makefile,v 1.28 2002/08/18 11:26:48 espie Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc sparc64
COMMENT= "Movie player"
DISTNAME= MPlayer-0.90pre5
DISTNAME= MPlayer-0.90pre6
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -17,6 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://www2.mplayerhq.hu/MPlayer/releases/
MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/releases/
#MASTER_SITES0= http://www2.mplayerhq.hu/MPlayer/Skin/
MASTER_SITES0= http://www.sightly.net/mplayer/
@ -70,6 +72,7 @@ CONFIGURE_ARGS+=--disable-gui \
--disable-xv \
--disable-x11 \
--disable-sunaudio
PLIST=pkg/PLIST-no_x11
. endif
.else
CONFIGURE_ARGS+=--enable-gui \

12
x11/mplayer/distinfo
View File

@ -1,6 +1,6 @@
MD5 (MPlayer-0.90pre5.tar.bz2) = e5655c304af41b23701653eb7a810d3f
MD5 (default.tar.bz2) = 8134215252ada2429f6d9456725c713f
RMD160 (MPlayer-0.90pre5.tar.bz2) = 5a1a72b1101931364904f5f4aef7d5ed0e7ca4f2
RMD160 (default.tar.bz2) = 0915e1b38037edbfac2cdeb5bc4220760ee80598
SHA1 (MPlayer-0.90pre5.tar.bz2) = 1a78063dd055ce99985001072fb2057156f8cd2a
SHA1 (default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d
MD5 (mplayer/MPlayer-0.90pre6.tar.bz2) = 819b4db6133291886df34cadcc03e09d
MD5 (mplayer/default.tar.bz2) = 8134215252ada2429f6d9456725c713f
RMD160 (mplayer/MPlayer-0.90pre6.tar.bz2) = 34ed793c3693cbd5c4032e65a071e1607bedc5b1
RMD160 (mplayer/default.tar.bz2) = 0915e1b38037edbfac2cdeb5bc4220760ee80598
SHA1 (mplayer/MPlayer-0.90pre6.tar.bz2) = 487cea09f024191ec7f632292ede1eb33bc931c4
SHA1 (mplayer/default.tar.bz2) = 72eb4f088e19b20d3b861180525dffde4796a27d

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

@ -1,164 +0,0 @@
$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;
}
-int __section( char * in )
+int skin__section( char * in )
{
strlower( in );
defList=NULL;
@@ -83,7 +83,7 @@ int __section( char * in )
return 0;
}
-int __end( char * in )
+int skin__end( char * in )
{
if ( strlen( winList ) ) winList[0]=0;
else defList=NULL;
@@ -91,7 +91,7 @@ int __end( char * in )
return 0;
}
-int __window( char * in )
+int skin__window( char * in )
{
CHECKDEFLIST( "window" );
@@ -101,7 +101,7 @@ int __window( char * in )
return 0;
}
-int __base( char * in )
+int skin__base( char * in )
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -188,7 +188,7 @@ int __base( char * in )
return 0;
}
-int __background( char * in )
+int skin__background( char * in )
{
CHECKDEFLIST( "background" );
CHECKWINLIST( "background" );
@@ -203,7 +203,7 @@ int __background( char * in )
return 0;
}
-int __button( char * in )
+int skin__button( char * in )
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -246,7 +246,7 @@ int __button( char * in )
return 0;
}
-int __selected( char * in )
+int skin__selected( char * in )
{
unsigned char fname[512];
unsigned char tmp[512];
@@ -265,7 +265,7 @@ int __selected( char * in )
return 0;
}
-int __menu( char * in )
+int skin__menu( char * in )
{ // menu = number,x,y,sx,sy,msg
int x,y,sx,sy,msg;
unsigned char tmp[64];
@@ -297,7 +297,7 @@ int __menu( char * in )
return 0;
}
-int __hpotmeter( char * in )
+int skin__hpotmeter( char * in )
{ // 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];
@@ -354,7 +354,7 @@ int __hpotmeter( char * in )
return 0;
}
-int __potmeter( char * in )
+int skin__potmeter( char * in )
{ // potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
int x,y,ph,sx,sy,msg,d;
unsigned char tmp[512];
@@ -397,7 +397,7 @@ int __potmeter( char * in )
return 0;
}
-int __font( char * in )
+int skin__font( char * in )
{ // font=fontname,fontid
char name[512];
char id[512];
@@ -426,7 +426,7 @@ int __font( char * in )
return 0;
}
-int __slabel( char * in )
+int skin__slabel( char * in )
{
char tmp[512];
char sid[63];
@@ -460,7 +460,7 @@ int __slabel( char * in )
return 0;
}
-int __dlabel( char * in )
+int skin__dlabel( char * in )
{ // dlabel=x,y,sx,align,fontid,string ...
char tmp[512];
char sid[63];
@@ -496,7 +496,7 @@ int __dlabel( char * in )
return 0;
}
-int __decoration( char * in )
+int skin__decoration( char * in )
{
char tmp[512];
@@ -521,20 +521,20 @@ typedef struct
_item skinItem[] =
{
- { "section", __section },
- { "end", __end },
- { "window", __window },
- { "base", __base },
- { "button", __button },
- { "selected", __selected },
- { "background", __background },
- { "hpotmeter", __hpotmeter },
- { "potmeter", __potmeter },
- { "font", __font },
- { "slabel", __slabel },
- { "dlabel", __dlabel },
- { "decoration", __decoration },
- { "menu", __menu }
+ { "section", skin__section },
+ { "end", skin__end },
+ { "window", skin__window },
+ { "base", skin__base },
+ { "button", skin__button },
+ { "selected", skin__selected },
+ { "background", skin__background },
+ { "hpotmeter", skin__hpotmeter },
+ { "potmeter", skin__potmeter },
+ { "font", skin__font },
+ { "slabel", skin__slabel },
+ { "dlabel", skin__dlabel },
+ { "decoration", skin__decoration },
+ { "menu", skin__menu }
};
#define ITEMS (int)( sizeof( skinItem )/sizeof( _item ) )

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

@ -1,24 +1,19 @@
$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"
-if test "$_sys_soundcard" != yes ; then
+if test "$_sys_soundcard" != yes -a "$_ossaudio" != no; then
echocheck "soundcard.h"
cat > $TMPC << EOF
#include <soundcard.h>
@@ -2720,6 +2720,7 @@ if test "$_ossaudio" = yes ; then
$OpenBSD: patch-configure,v 1.12 2002/08/18 11:26:48 espie Exp $
--- configure.orig Tue Aug 6 22:13:17 2002
+++ configure Tue Aug 6 22:23:29 2002
@@ -1728,6 +1728,11 @@ if test "$_soundcard" = yes ; then
else
if netbsd || openbsd ; then
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
+ _ld_arch="$_ld_arch -lossaudio"
else
_def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
_def_soundcard='#undef HAVE_SOUNDCARD_H'
fi
@@ -2875,7 +2876,7 @@ echores "$_sgiaudio"
+if test openbsd && test "$_ossaudio" = no ; then
+ _def_soundcard='#undef HAVE_SOUNDCARD_H'
+ _inc_soundcard=''
+ _soundcard='no'
+fi
echores "$_soundcard"
else
_def_soundcard='#undef HAVE_SOUNDCARD_H'
@@ -2955,7 +2960,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -27,52 +22,12 @@ $OpenBSD: patch-configure,v 1.11 2002/06/27 22:03:49 espie Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -2888,7 +2889,7 @@ fi
@@ -2968,7 +2973,7 @@ fi
echocheck "DVD support (libmpdvdkit)"
if test "$_dvdkit" = auto ; then
_dvdkit=no
- if linux || freebsd || netbsd ; then
+ if linux || freebsd || netbsd || openbsd; then
- if linux || freebsd || netbsd || darwin || cygwin; then
+ if linux || freebsd || netbsd || openbsd || darwin || cygwin; 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
- elif bsdos ; then
+ elif bsdos || openbsd; then
cc_check -lm -liconv && _iconv=yes
else
cc_check -lm && _iconv=yes
@@ -3268,6 +3269,7 @@ if test "$_iconv" = yes ; then
_def_iconv='#define USE_ICONV 1'
freebsd && _ld_iconv='-lgiconv'
bsdos && _ld_iconv='-liconv'
+ openbsd && _ld_iconv='-liconv'
else
_def_iconv='#undef USE_ICONV'
fi
@@ -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
- _ld_arch="$_ld_arch -lossaudio"
x86 && _ld_arch="$_ld_arch -li386"
fi
@@ -3847,10 +3848,10 @@ cat > config.mak << EOF
LANG = C
TARGET_OS = $system_name
-prefix = $_prefix
-DATADIR = $_datadir
-CONFDIR = $_confdir
-LIBDIR = $_libdir
+prefix = \$(DESTDIR)$_prefix
+DATADIR = \$(DESTDIR)$_datadir
+CONFDIR = \$(DESTDIR)$_confdir
+LIBDIR = \$(DESTDIR)$_libdir
#AR = ar
CC = $_cc
AWK = $_awk

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-libdha_Makefile,v 1.7 2002/08/18 11:26:48 espie Exp $
--- libdha/Makefile.orig Wed Jul 3 20:59:47 2002
+++ libdha/Makefile Tue Aug 6 22:51:05 2002
@@ -7,9 +7,13 @@ VERSION = 0.1
ifeq ($(TARGET_OS),CYGWIN)
SHORTNAME = libdha.dll
@ -16,17 +16,7 @@ $OpenBSD: patch-libdha_Makefile,v 1.6 2002/06/27 22:03:49 espie Exp $
SRCS=libdha.c mtrr.c pci.c pci_names.c
OBJS=$(SRCS:.c=.o)
@@ -17,21 +21,22 @@ OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -fPIC -I. -I.. -Wall -W
LIBS =
ifeq ($(TARGET_OS),OpenBSD)
+ifeq ($(TARGET_ARCH_X86),yes)
LIBS += -li386
endif
+endif
.SUFFIXES: .c .o
@@ -27,13 +31,12 @@ endif
# .PHONY: all clean
.c.o:
@ -42,7 +32,7 @@ $OpenBSD: patch-libdha_Makefile,v 1.6 2002/06/27 22:03:49 espie Exp $
pci_names.c:
$(AWK) -f pci_db2c.awk oth/pci.db
@@ -54,8 +59,8 @@ depend:
@@ -56,8 +59,8 @@ depend:
install:
mkdir -p $(prefix)/lib
install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME)

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

@ -1,21 +0,0 @@
$OpenBSD: patch-libdha_sysdep_AsmMacros_powerpc_h,v 1.1 2002/05/12 08:16:24 pvalchev Exp $
--- libdha/sysdep/AsmMacros_powerpc.h.orig Sun May 12 00:45:44 2002
+++ libdha/sysdep/AsmMacros_powerpc.h Sun May 12 00:46:13 2002
@@ -7,7 +7,7 @@
#ifndef __ASM_MACROS_POWERPC_H
#define __ASM_MACROS_POWERPC_H
-#if defined(Lynx)
+#if defined(Lynx) || defined(__OpenBSD__)
extern unsigned char *ioBase;
@@ -18,7 +18,7 @@ static __inline__ volatile void eieio()
static __inline__ void outb(short port, unsigned char value)
{
- *(uchar *)(ioBase + port) = value; eieio();
+ *(unsigned char *)(ioBase + port) = value; eieio();
}
static __inline__ void outw(short port, unsigned short value)

17
x11/mplayer/patches/patch-libdha_sysdep_pci_openbsd_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-libdha_sysdep_pci_openbsd_c,v 1.3 2002/05/15 22:27:01 pvalchev Exp $
--- libdha/sysdep/pci_openbsd.c.orig Sun May 12 04:18:50 2002
+++ libdha/sysdep/pci_openbsd.c Wed May 15 00:30:20 2002
@@ -4,6 +4,8 @@
Modified for readability by Nick Kurshev
*/
+#ifdef __i386__
+
#include <errno.h>
#include <sys/types.h>
#include <machine/sysarch.h>
@@ -22,3 +24,4 @@ static __inline__ int disable_os_io(void
/* Nothing to do */
return(0);
}
+#endif

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

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-libmpdemux_stream_c,v 1.4 2002/08/18 11:26:48 espie Exp $
--- libmpdemux/stream.c.orig Sun Aug 4 15:35:25 2002
+++ libmpdemux/stream.c Tue Aug 6 22:32:16 2002
@@ -22,11 +22,10 @@ extern int verbose; // defined in mplaye
#ifdef HAVE_VCD

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

@ -1,10 +0,0 @@
$OpenBSD: patch-libvo_sub_h,v 1.2 2002/05/16 11:58:48 espie Exp $
--- libvo/sub.h.orig Sun May 12 04:18:52 2002
+++ libvo/sub.h Thu May 16 00:35:47 2002
@@ -106,5 +106,6 @@ int vo_osd_check_range_update(int,int,in
extern int vo_osd_changed_flag;
+int vo_osd_check_range_update(int,int,int,int);
#endif
#endif

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-vidix_drivers_Makefile,v 1.3 2002/08/18 11:26:48 espie Exp $
--- vidix/drivers/Makefile.orig Fri Jul 5 17:37:51 2002
+++ vidix/drivers/Makefile Tue Aug 6 22:38:02 2002
@@ -3,6 +3,7 @@
include ../../config.mak
@ -9,7 +9,7 @@ $OpenBSD: patch-vidix_drivers_Makefile,v 1.2 2002/06/27 22:03:49 espie Exp $
RADEON_VID=radeon_vid.so
@@ -121,7 +122,7 @@ depend:
@@ -109,7 +110,7 @@ depend:
install:
mkdir -p $(BINDIR)

5
x11/mplayer/pkg/PLIST
View File

@ -1,12 +1,11 @@
@comment $OpenBSD: PLIST,v 1.2 2002/05/28 11:49:43 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2002/08/18 11:26:48 espie Exp $
bin/gmplayer
bin/mencoder
bin/mplayer
lib/mplayer/vidix/genfb_vid.so
lib/mplayer/vidix/mach64_vid.so
lib/mplayer/vidix/mga_crtc2_vid.so
lib/mplayer/vidix/mga_vid.so
lib/mplayer/vidix/nvidia_vid.so
lib/mplayer/vidix/pm3_vid.so
lib/mplayer/vidix/radeon_vid.so
lib/mplayer/vidix/rage128_vid.so
%%SHARED%%