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

update from maintainer Bjorn Sandell <biorn@dce.chalmers.se>

Browse Source 
* Make mplayer compile on i386/elf
* Some whitespace and "=" -> "+=" in Makefile (from Thorsten Glaser)
This commit is contained in:
wilfried 2003-04-17 22:16:18 +00:00
parent 44eeac9bbe
commit 294c607e02
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.53 2003/04/17 10:35:07 wilfried Exp $
# $OpenBSD: Makefile,v 1.54 2003/04/17 22:16:18 wilfried Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= i386 macppc
@ -11,7 +11,7 @@ PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.mplayerhq.hu
HOMEPAGE= http://www.mplayerhq.hu/
# GPL
PERMIT_PACKAGE_CDROM= "patents"
@ -36,11 +36,11 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${SKIN}-${SKINVER}${EXTRACT_SUFX}:0
.include <bsd.own.mk>
.if ${ELF_TOOLCHAIN:L} == "no"
BUILD_DEPENDS= :binutils->=2.11.2:devel/binutils/stable
MAKE_ENV= AR=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bin/ar
BUILD_DEPENDS+= :binutils->=2.11.2:devel/binutils/stable
MAKE_ENV+= AR=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bin/ar
CONFIGURE_ARGS+=--as=${LOCALBASE}/${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}/bin/as
.endif
LIB_DEPENDS= png::graphics/png \
LIB_DEPENDS+= png::graphics/png \
jpeg::graphics/jpeg \
mp3lame::audio/lame \
ungif,gif::graphics/libungif \
@ -101,13 +101,13 @@ CONFIGURE_ARGS+=--disable-liblzo
ERRORS+="Fatal: nonsense combination of flavors"
. else
CONFIGURE_ARGS+=--disable-gui \
--disable-gl \
--disable-xv \
--disable-x11
--disable-gl \
--disable-xv \
--disable-x11
. endif
.else
CONFIGURE_ARGS+=--enable-gui \
--enable-gl
--enable-gl
USE_X11= Yes
LIB_DEPENDS+= gtk,gdk::x11/gtk+
.endif

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

@ -0,0 +1,12 @@
$OpenBSD: patch-libavcodec_common_h,v 1.1 2003/04/17 22:16:18 wilfried Exp $
--- libavcodec/common.h.orig Thu Apr 17 23:49:10 2003
+++ libavcodec/common.h Fri Apr 18 00:00:45 2003
@@ -158,7 +158,7 @@ typedef signed long long INT64;
# include "bswap.h"
# if defined(__MINGW32__) || defined(__CYGWIN__) || \
- defined(__OS2__) || defined (__OpenBSD__)
+ defined(__OS2__) || (defined (__OpenBSD__) && ! defined (__ELF__))
# define MANGLE(a) "_" #a
# else
# define MANGLE(a) #a