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

Update to 1.0pre7

Browse Source 
Don't depend on ogg/vorbis as it's built in now
Put fontconfig and freetype in WANTLIB and BUILD_DEPEND on pkgconfig if
 FLAVOR is not no_x11.
This commit is contained in:
biorn 2005-05-09 12:24:38 +00:00
parent ba4a389029
commit f5271b838d
8 changed files with 37 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/mplayer/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.82 2005/04/01 06:28:57 biorn Exp $
# $OpenBSD: Makefile,v 1.83 2005/05/09 12:24:38 biorn Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
COMMENT= "Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
DISTNAME= MPlayer-1.0pre6a
DISTNAME= MPlayer-1.0pre7
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p1
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= "patents"
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c freetype m ogg pthread stdc++ termcap util z
WANTLIB= c m pthread stdc++ termcap util z
MASTER_SITES= http://www2.mplayerhq.hu/MPlayer/releases/
MASTER_SITES+= http://www.mplayerhq.hu/MPlayer/releases/
@ -42,7 +42,6 @@ LIB_DEPENDS= png::graphics/png \
jpeg::graphics/jpeg \
mp3lame::audio/lame \
ungif::graphics/libungif \
vorbis.0::audio/libvorbis \
cdda_paranoia,cdda_interface:cdparanoia->=3.a9.8:audio/cdparanoia
CONFDIR= ${SYSCONFDIR}/mplayer
@ -103,14 +102,18 @@ ERRORS+="Fatal: nonsense combination of flavors"
CONFIGURE_ARGS+=--disable-gui \
--disable-gl \
--disable-xv \
--disable-x11
--disable-x11 \
--disable-fontconfig \
--disable-freetype
. endif
.else
CONFIGURE_ARGS+=--enable-gui \
--enable-gl
USE_X11= Yes
LIB_DEPENDS+= gtk,gdk::x11/gtk+
BUILD_DEPENDS+= :pkgconfig->=0.15.0p0:devel/pkgconfig
WANTLIB+= GL X11 Xext Xi Xinerama Xv Xxf86dga Xxf86vm glib gmodule intl
WANTLIB+= freetype fontconfig
.endif
.if ${FLAVOR:L:Msdl}

8
x11/mplayer/distinfo
View File

@ -1,8 +1,8 @@
MD5 (mplayer/MPlayer-1.0pre6a.tar.bz2) = a812d945b884c2e2fa7f90c57cd76bff
MD5 (mplayer/MPlayer-1.0pre7.tar.bz2) = 5fadd6957d3aab989cd760ff38fb8fdf
MD5 (mplayer/default-1.7.tar.bz2) = 7e1d16c2f8a32469f4354cb043eecc5d
RMD160 (mplayer/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
RMD160 (mplayer/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
RMD160 (mplayer/default-1.7.tar.bz2) = 5f78ff9db296d8fd53ef6603ec8a227eeb602dd1
SHA1 (mplayer/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
SHA1 (mplayer/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
SIZE (mplayer/MPlayer-1.0pre6a.tar.bz2) = 6380482
SIZE (mplayer/MPlayer-1.0pre7.tar.bz2) = 6868877
SIZE (mplayer/default-1.7.tar.bz2) = 173439

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.10 2005/03/09 16:07:29 biorn Exp $
--- Makefile.orig Fri Nov 5 15:02:40 2004
+++ Makefile Sat Dec 25 16:15:14 2004
@@ -249,7 +249,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
$OpenBSD: patch-Makefile,v 1.11 2005/05/09 12:24:38 biorn Exp $
--- Makefile.orig Sat Apr 16 22:18:12 2005
+++ Makefile Wed Apr 20 06:35:54 2005
@@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
ifeq ($(MENCODER),yes)
$(PRG_MENCODER): $(MENCODER_DEP)
@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.10 2005/03/09 16:07:29 biorn Exp $
endif
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
@@ -312,8 +312,6 @@ ifeq ($(GUI),yes)
@@ -325,8 +325,6 @@ ifeq ($(GUI),yes)
@if test ! -d $(prefix)/share/applications ; then mkdir -p $(prefix)/share/applications ; fi
$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
--- configure.orig Thu Dec 23 08:36:00 2004
+++ configure Sat Apr 9 01:51:28 2005
@@ -465,6 +465,9 @@ if test -z "$_target" ; then
$OpenBSD: patch-configure,v 1.33 2005/05/09 12:24:38 biorn Exp $
--- configure.orig Wed Apr 13 13:46:35 2005
+++ configure Wed Apr 20 06:35:54 2005
@@ -475,6 +475,9 @@ if test -z "$_target" ; then
if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
-z "`echo $CFLAGS | grep -- -m32`" ]; then
host_arch=x86_64
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
else
host_arch=i386
fi
@@ -700,10 +703,15 @@ fi
@@ -710,10 +713,15 @@ fi
x86_exts_check()
{
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
_mmx=no
_3dnow=no
@@ -2180,7 +2188,7 @@ echores "$_setlocale"
@@ -2195,7 +2203,7 @@ fi
echocheck "iconv"
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
_iconv_tmp='#include <iconv.h>'
cat > $TMPC << EOF
@@ -4659,7 +4667,7 @@ echores "$_sgiaudio"
@@ -4730,7 +4738,7 @@ echores "$_sgiaudio"
echocheck "VCD support"
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
_inputmodules="vcd $_inputmodules"
_def_vcd='#define HAVE_VCD 1'
echores "ok"
@@ -6607,7 +6615,7 @@ CACA_LIB = $_ld_caca
@@ -6775,7 +6783,7 @@ CACA_LIB = $_ld_caca
# audio output
ALSA_LIB = $_ld_alsa
NAS_LIB = $_ld_nas
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.32 2005/04/09 22:06:19 pvalchev Exp $
ARTS_INC = $_inc_arts
ESD_LIB = $_ld_esd
ESD_INC = $_inc_esd
@@ -6877,7 +6885,7 @@ $_def_malloc
@@ -7041,7 +7049,7 @@ $_def_malloc
$_def_memalign
#ifndef HAVE_MEMALIGN
# define memalign(a,b) malloc(b)

15
x11/mplayer/patches/patch-cpudetect_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-cpudetect_c,v 1.2 2005/04/01 06:28:58 biorn Exp $
--- cpudetect.c.orig Thu Oct 21 13:55:19 2004
+++ cpudetect.c Mon Jan 10 19:47:32 2005
@@ -320,7 +322,10 @@ LONG CALLBACK win32_sig_handler_sse(EXCE
*/
static void check_os_katmai_support( void )
{
-#if defined(__FreeBSD__)
+#ifdef ARCH_X86_64
+ gCpuCaps.hasSSE=1;
+ gCpuCaps.hasSSE2=1;
+#elif defined(__FreeBSD__)
int has_sse=0, ret;
size_t len=sizeof(has_sse);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mp3lib_layer2_c,v 1.1 2004/10/18 06:48:20 biorn Exp $
--- mp3lib/layer2.c.orig Tue Apr 6 03:06:21 2004
+++ mp3lib/layer2.c Fri Sep 17 23:30:00 2004
@@ -288,6 +288,11 @@ static int do_layer2(struct frame *fr,in
$OpenBSD: patch-mp3lib_layer2_c,v 1.2 2005/05/09 12:24:38 biorn Exp $
--- mp3lib/layer2.c.orig Sat Apr 16 00:21:34 2005
+++ mp3lib/layer2.c Wed Apr 20 06:35:55 2005
@@ -294,6 +294,11 @@ static int do_layer2(struct frame *fr,in
fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ?
(fr->mode_ext<<2)+4 : fr->II_sblimit;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mplayer_c,v 1.1 2005/03/09 16:07:29 biorn Exp $
--- mplayer.c.orig Tue Dec 21 13:25:58 2004
+++ mplayer.c Wed Mar 9 16:41:20 2005
@@ -574,7 +574,7 @@ static void exit_sighandler(int x){
$OpenBSD: patch-mplayer_c,v 1.2 2005/05/09 12:24:38 biorn Exp $
--- mplayer.c.orig Fri Apr 15 14:14:24 2005
+++ mplayer.c Wed Apr 20 06:35:55 2005
@@ -584,7 +584,7 @@ static void exit_sighandler(int x){
gdb_pid = fork();
mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n");
if (gdb_pid == 0) { // We are the child
@ -10,16 +10,7 @@ $OpenBSD: patch-mplayer_c,v 1.1 2005/03/09 16:07:29 biorn Exp $
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
} else if (gdb_pid < 0)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");
@@ -998,7 +998,7 @@ int gui_no_filename=0;
mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n");
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
GetCpuCaps(&gCpuCaps);
-#ifdef ARCH_X86
+#if defined (ARCH_X86) || defined (ARCH_X86_64)
mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
@@ -3454,7 +3454,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
@@ -3500,7 +3500,7 @@ if (stream->type==STREAMTYPE_DVDNAV && d
case MP_CMD_RUN : {
#ifndef __MINGW32__
if(!fork()) {

3
x11/mplayer/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2005/03/09 16:07:29 biorn Exp $
@comment $OpenBSD: PLIST,v 1.20 2005/05/09 12:24:38 biorn Exp $
bin/mencoder
bin/mplayer
@man man/man1/mencoder.1
@ -45,7 +45,6 @@ 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
share/doc/mplayer/menc-feat-fix-avi.html
share/doc/mplayer/menc-feat-mpeg.html
share/doc/mplayer/menc-feat-mpeg4.html
share/doc/mplayer/menc-feat-rescale.html