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

Update to mplayer-0.90pre8; from biorn@dce.chalmers.se

Browse Source
This commit is contained in:
pvalchev 2002-10-14 09:50:48 +00:00
parent 39ef8b05cc
commit f51b582efd
12 changed files with 63 additions and 170 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.32 2002/09/14 12:19:15 naddy Exp $
# $OpenBSD: Makefile,v 1.33 2002/10/14 09:50:48 pvalchev Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc sparc64
COMMENT= "Movie player"
DISTNAME= MPlayer-0.90pre6
DISTNAME= MPlayer-0.90pre8
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
@ -35,7 +35,6 @@ BUILD_DEPENDS= :binutils->=2.11.2:devel/binutils/stable
.endif
LIB_DEPENDS= png::graphics/png \
jpeg::graphics/jpeg \
dvdread.::devel/libdvdread \
mp3lame::audio/lame \
ungif,gif::graphics/libungif \
vorbis.0,vorbisfile.1::audio/libvorbis
@ -56,7 +55,8 @@ CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bi
--enable-vidix \
--enable-vorbis \
--with-extraincdir=${LOCALBASE}/include/libpng:${LOCALBASE}/include \
--with-extralibdir=${LOCALBASE}/lib
--with-extralibdir=${LOCALBASE}/lib \
--confdir=${LOCALBASE}/share/mplayer
.if ${MACHINE_ARCH:Mpowerpc}
CONFIGURE_ARGS+=--target=ppc-openbsd
@ -135,9 +135,8 @@ CONFIGURE_ARGS+=--disable-win32
.endif
.if ${FLAVOR:L:Mcdda}
CFLAGS+=-Dsize32=int -Dsize16=short
CONFIGURE_ARGS+=--enable-cdparanoia
LIB_DEPENDS+= cdda_paranoia,cdda_interface::audio/cdparanoia
BUILD_DEPENDS+= cdda_paranoia,cdda_interface:cdparanoia->=3.a9.8:audio/cdparanoia
.else
CONFIGURE_ARGS+=--disable-cdparanoia
.endif

6
x11/mplayer/distinfo
View File

@ -1,6 +1,6 @@
MD5 (mplayer/MPlayer-0.90pre6.tar.bz2) = 819b4db6133291886df34cadcc03e09d
MD5 (mplayer/MPlayer-0.90pre8.tar.bz2) = 8c844865b05574a1cfb2813e8487d21b
MD5 (mplayer/default-1.1.tar.bz2) = 95417702dbb28226a2b0a20139ddfd0b
RMD160 (mplayer/MPlayer-0.90pre6.tar.bz2) = 34ed793c3693cbd5c4032e65a071e1607bedc5b1
RMD160 (mplayer/MPlayer-0.90pre8.tar.bz2) = d640299cb1f853198bbd3c48b56e147e340f517e
RMD160 (mplayer/default-1.1.tar.bz2) = bdcb3db26d6d5cc2ac8de3c0bd9ea40921e509a4
SHA1 (mplayer/MPlayer-0.90pre6.tar.bz2) = 487cea09f024191ec7f632292ede1eb33bc931c4
SHA1 (mplayer/MPlayer-0.90pre8.tar.bz2) = f61ec2af22f65a402bf8bfe93bd248298acca30f
SHA1 (mplayer/default-1.1.tar.bz2) = 804d181e96c81e3794260dc8976786f3a535a3cf

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.13 2002/08/18 13:17:50 espie Exp $
--- configure.orig Mon Aug 5 19:23:22 2002
+++ configure Sun Aug 18 14:54:42 2002
@@ -1728,6 +1728,11 @@ if test "$_soundcard" = yes ; then
$OpenBSD: patch-configure,v 1.14 2002/10/14 09:50:48 pvalchev Exp $
--- configure.orig Tue Sep 17 21:47:55 2002
+++ configure Thu Sep 19 17:14:38 2002
@@ -1828,6 +1828,11 @@ if test "$_soundcard" = yes ; then
else
_def_soundcard='#undef HAVE_SOUNDCARD_H'
fi
@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.13 2002/08/18 13:17:50 espie Exp $
echores "$_soundcard"
else
_def_soundcard='#undef HAVE_SOUNDCARD_H'
@@ -2955,7 +2960,7 @@ echores "$_sgiaudio"
@@ -3093,7 +3098,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -22,20 +22,12 @@ $OpenBSD: patch-configure,v 1.13 2002/08/18 13:17:50 espie Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -2968,7 +2973,7 @@ fi
echocheck "DVD support (libmpdvdkit)"
if test "$_dvdkit" = auto ; then
_dvdkit=no
- if linux || freebsd || netbsd || darwin || cygwin; then
+ if linux || freebsd || netbsd || openbsd || darwin || cygwin; then
test -f "./libmpdvdkit/Makefile" && _dvdkit=yes
fi
fi
@@ -3109,6 +3114,7 @@ if test "$_cdparanoia" = yes ; then
_def_cdparanoia='#define HAVE_CDDA'
_inputmodules="cdda $_inputmodules"
_ld_cdparanoia="$_ld_cdparanoia -lcdda_interface -lcdda_paranoia"
+ openbsd && _ld_cdparanoia="$_ld_cdparanoia -lutil"
else
_def_cdparanoia='#undef HAVE_CDDA'
_noinputmodules="cdda $_noinputmodules"
@@ -3623,7 +3628,7 @@ fi
echocheck "iconv"
-if test "$_iconv" = auto ; then
+if test "$_iconv" != no ; then
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF

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

@ -0,0 +1,12 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.1 2002/10/14 09:50:48 pvalchev Exp $
--- libavcodec/Makefile.orig Thu Sep 5 17:57:44 2002
+++ libavcodec/Makefile Thu Sep 5 18:02:03 2002
@@ -97,7 +97,7 @@ tests: apiexample cpuid_test $(TESTS)
$(LIB): $(OBJS)
rm -f $@
$(AR) rc $@ $(OBJS)
- $(RANLIB) $@
+# $(RANLIB) $@
$(SLIB): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)

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

@ -1,22 +1,7 @@
$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
else
+ifeq ($(TARGET_OS),OpenBSD)
+SHORTNAME = libdha.so.0.1
+else
SHORTNAME = libdha.so
endif
-LIBNAME = libdha-$(VERSION).so
+endif
+LIBNAME = $(SHORTNAME)
SRCS=libdha.c mtrr.c pci.c pci_names.c
OBJS=$(SRCS:.c=.o)
@@ -27,13 +31,12 @@ endif
$OpenBSD: patch-libdha_Makefile,v 1.8 2002/10/14 09:50:48 pvalchev Exp $
--- libdha/Makefile.orig Fri Aug 23 01:29:40 2002
+++ libdha/Makefile Thu Sep 5 17:31:36 2002
@@ -27,13 +27,12 @@ endif
# .PHONY: all clean
.c.o:
@ -24,7 +9,7 @@ $OpenBSD: patch-libdha_Makefile,v 1.7 2002/08/18 11:26:48 espie Exp $
+ PATH=/bin:/usr/bin $(CC) -c $(CFLAGS) -o $@ $<
$(LIBNAME): $(OBJS)
$(CC) -shared -o $(LIBNAME) $(OBJS) $(LIBS)
$(CC) -shared -Wl,-soname -Wl,$(LIBNAME) -o $(LIBNAME) $(OBJS) $(LIBS)
- ln -sf $(LIBNAME) $(SHORTNAME)
-all: $(LIBNAME) $(SHORTNAME)
@ -32,14 +17,12 @@ $OpenBSD: patch-libdha_Makefile,v 1.7 2002/08/18 11:26:48 espie Exp $
pci_names.c:
$(AWK) -f pci_db2c.awk oth/pci.db
@@ -56,8 +59,8 @@ depend:
@@ -56,8 +55,6 @@ depend:
install:
mkdir -p $(prefix)/lib
install -m 755 -s -p $(LIBNAME) $(prefix)/lib/$(LIBNAME)
- rm -f $(prefix)/lib/libdha.so
- ln -sf $(LIBNAME) $(prefix)/lib/$(SHORTNAME)
+# rm -f $(prefix)/lib/libdha.so
+# ln -sf $(LIBNAME) $(prefix)/lib/$(SHORTNAME)
ifeq ($(TARGET_OS),OpenBSD)
ldconfig -R
else

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

@ -1,12 +0,0 @@
$OpenBSD: patch-libmpcodecs_dec_audio_c,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- libmpcodecs/dec_audio.c.orig Sat May 4 01:08:10 2002
+++ libmpcodecs/dec_audio.c Sat May 4 01:10:35 2002
@@ -26,6 +26,8 @@ int audio_output_channels = 2;
static ad_functions_t* mpadec;
+void uninit_audio(sh_audio_t *sh_audio);
+
int init_audio(sh_audio_t *sh_audio)
{
unsigned i;

77
x11/mplayer/patches/patch-libmpdemux_cddb_c
View File

@ -1,77 +0,0 @@
$OpenBSD: patch-libmpdemux_cddb_c,v 1.1 2002/08/18 13:17:51 espie Exp $
--- libmpdemux/cddb.c.orig Wed Jul 10 10:51:11 2002
+++ libmpdemux/cddb.c Sun Aug 18 14:58:04 2002
@@ -28,14 +28,20 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
#define SYS_BSD 1
#endif
+#if defined(__OpenBSD__)
+#define SYS_OBSD 1
+#endif
#if defined(__linux__)
#include <linux/cdrom.h>
#elif defined(SYS_BSD)
#include <sys/cdio.h>
+#elif defined(SYS_OBSD)
+#include <util.h>
+#include <sys/cdio.h>
#endif
#include "cdd.h"
@@ -111,8 +117,50 @@ read_toc(void) {
close(drive);
return tochdr.ending_track;
}
-#endif
+#elif defined(SYS_OBSD)
+int
+read_toc(void) {
+ int drive;
+ struct ioc_toc_header tochdr;
+ struct ioc_read_toc_entry tocentry;
+ int i;
+ char *drivename;
+ char *realdev;
+ struct cd_toc_entry toc_buffer;
+
+ drivename = getenv("CDROM");
+ if (!drivename)
+ drivename = "cd0";
+ drive = opendev(drivename, O_RDONLY, OPENDEV_PART, &realdev);
+ if (!drive)
+ return -1;
+
+ ioctl(drive, CDIOREADTOCHEADER, &tochdr);
+ for (i = tochdr.starting_track; i <= tochdr.ending_track; i++) {
+ tocentry.starting_track = i;
+ tocentry.address_format = CD_MSF_FORMAT;
+ tocentry.data = &toc_buffer;
+ tocentry.data_len = sizeof(toc_buffer);
+ ioctl(drive, CDIOREADTOCENTRYS, &tocentry);
+ cdtoc[i-1].min = toc_buffer.addr.msf.minute;
+ cdtoc[i-1].sec = toc_buffer.addr.msf.second;
+ cdtoc[i-1].frame = toc_buffer.addr.msf.frame;
+ cdtoc[i-1].frame += cdtoc[i-1].min*60*75;
+ cdtoc[i-1].frame += cdtoc[i-1].sec*75;
+ }
+ tocentry.starting_track = 0xAA;
+ tocentry.address_format = CD_MSF_FORMAT;
+ ioctl(drive, CDIOREADTOCENTRYS, &tocentry);
+ cdtoc[tochdr.ending_track].min = toc_buffer.addr.msf.minute;
+ cdtoc[tochdr.ending_track].sec = toc_buffer.addr.msf.second;
+ cdtoc[tochdr.ending_track].frame = toc_buffer.addr.msf.frame;
+ cdtoc[tochdr.ending_track].frame += cdtoc[tochdr.ending_track].min*60*75;
+ cdtoc[tochdr.ending_track].frame += cdtoc[tochdr.ending_track].sec*75;
+ close(drive);
+ return tochdr.ending_track;
+}
+#endif
unsigned int
cddb_sum(int n) {
unsigned int ret;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libmpdemux_stream_c,v 1.4 2002/08/18 11:26:48 espie Exp $
$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 Aug 6 22:32:16 2002
@@ -22,11 +22,10 @@ extern int verbose; // defined in mplaye
+++ libmpdemux/stream.c Tue Sep 10 22:47:17 2002
@@ -22,7 +22,7 @@ extern int verbose; // defined in mplaye
#ifdef HAVE_VCD
@ -10,7 +10,3 @@ $OpenBSD: patch-libmpdemux_stream_c,v 1.4 2002/08/18 11:26:48 espie Exp $
#include "vcd_read_fbsd.h"
#elif defined(__NetBSD__)
#include "vcd_read_nbsd.h"
-#else
#include "vcd_read.h"
#endif

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

@ -1,10 +1,10 @@
$OpenBSD: patch-loader_stubs_s,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- loader/stubs.s.orig Sun Apr 21 02:30:44 2002
+++ loader/stubs.s Wed May 8 01:42:08 2002
$OpenBSD: patch-loader_stubs_s,v 1.2 2002/10/14 09:50:48 pvalchev Exp $
--- loader/stubs.s.orig Wed Aug 28 02:24:26 2002
+++ loader/stubs.s Thu Sep 5 17:35:40 2002
@@ -1,8 +1,8 @@
.data
.LC0: .string "Called unk_%s\n"
.align 4
.balign 4
-.globl unk_exp1
-unk_exp1:
+.globl _unk_exp1

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

@ -1,6 +1,6 @@
$OpenBSD: patch-mp3lib_Makefile,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
--- mp3lib/Makefile.orig Mon Apr 29 23:42:36 2002
+++ mp3lib/Makefile Wed May 8 18:03:47 2002
$OpenBSD: patch-mp3lib_Makefile,v 1.2 2002/10/14 09:50:48 pvalchev Exp $
--- mp3lib/Makefile.orig Sun Sep 1 20:25:24 2002
+++ mp3lib/Makefile Thu Sep 5 17:36:25 2002
@@ -38,9 +38,6 @@ libMP3.a: $(OBJS)
ifeq ($(TARGET_OS),CYGWIN)
./mp3lib_objfix.sh
@ -9,5 +9,5 @@ $OpenBSD: patch-mp3lib_Makefile,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
- ./mp3lib_objfix.sh
-endif
test1: libMP3.a test.c
$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. -L. -lMP3 -lm
$(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. ./libMP3.a ../mp_msg-mencoder.o ../cpudetect.o -lm

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

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-mp3lib_dct64_k7_c,v 1.3 2002/10/14 09:50:48 pvalchev Exp $
--- mp3lib/dct64_k7.c.orig Sat Sep 7 15:57:41 2002
+++ mp3lib/dct64_k7.c Thu Sep 19 17:18:57 2002
@@ -350,7 +350,7 @@ void __attribute__ (( __stdcall__ )) dct
" movd "MANGLE(plus_1f)", %%mm6\n\t"
" punpckldq 120(%%ebx), %%mm6\n\t" /* mm6 = 1.0 | 120(%%ebx)*/

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-vidix_drivers_Makefile,v 1.4 2002/10/14 09:50:48 pvalchev Exp $
--- vidix/drivers/Makefile.orig Fri Aug 23 01:29:46 2002
+++ vidix/drivers/Makefile Thu Sep 5 17:38:41 2002
@@ -3,6 +3,7 @@
include ../../config.mak
@ -12,9 +12,9 @@ $OpenBSD: patch-vidix_drivers_Makefile,v 1.3 2002/08/18 11:26:48 espie Exp $
@@ -109,7 +110,7 @@ depend:
install:
mkdir -p $(BINDIR)
- install -m 755 -s -p *.so $(BINDIR)
+ install -m 755 -p *.so $(BINDIR)
mkdir -p $(LIBDIR)/mplayer/vidix
- -install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix
+ -install -m 755 -p *.so $(LIBDIR)/mplayer/vidix
uninstall:
rm -f $(BINDIR)/*.so
rmdir -p --ignore-fail-on-non-empty $(BINDIR)
rm -f $(LIBDIR)/mplayer/vidix/*.so
rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix