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

* stop mplayer from picking up installed FFmpeg headers

Browse Source 
* update WANTLIB
* add @bin markers
* bump PKGNAME

feedback/ok brad@
This commit is contained in:
jakemsr 2008-07-09 02:19:36 +00:00
parent 9452aa9236
commit f0e6e48090
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.132 2008/05/01 13:52:19 sthen Exp $ # $OpenBSD: Makefile,v 1.133 2008/07/09 02:19:36 jakemsr Exp $
# May not be hard to add more. # May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
@ -9,7 +9,7 @@ V= 1.0rc2
N= mplayer N= mplayer
DISTNAME= MPlayer-${V} DISTNAME= MPlayer-${V}
DIST_SUBDIR= ${N} DIST_SUBDIR= ${N}
PKGNAME= ${N}-${V}p6 PKGNAME= ${N}-${V}p7
CATEGORIES= x11 multimedia CATEGORIES= x11 multimedia
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
@ -149,7 +149,7 @@ WANTLIB+= GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86dga Xxf86vm \ Xfixes Xi Xinerama Xrandr Xrender Xv Xxf86dga Xxf86vm \
atk-1.0 cairo expat fontconfig freetype glib-2.0 glitz \ atk-1.0 cairo expat fontconfig freetype glib-2.0 glitz \
gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \ gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pangoft2-1.0 pixman-1
MODULES= devel/gettext MODULES= devel/gettext
.endif .endif

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.17 2008/02/12 11:33:16 jakemsr Exp $ $OpenBSD: patch-Makefile,v 1.18 2008/07/09 02:19:36 jakemsr Exp $
--- Makefile.orig Sun Oct 7 12:49:33 2007 --- Makefile.orig Sun Oct 7 12:49:33 2007
+++ Makefile Tue Feb 12 02:49:30 2008 +++ Makefile Sat Jun 28 14:12:25 2008
@@ -88,7 +88,7 @@ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) @@ -88,7 +88,7 @@ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF)

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

@ -1,15 +1,15 @@
$OpenBSD: patch-common_mak,v 1.1 2008/02/08 17:32:41 jakemsr Exp $ $OpenBSD: patch-common_mak,v 1.2 2008/07/09 02:19:36 jakemsr Exp $
--- common.mak.orig Sun Oct 7 12:49:33 2007 --- common.mak.orig Sun Oct 7 12:49:33 2007
+++ common.mak Thu Jan 24 19:57:15 2008 +++ common.mak Sat Jun 28 14:11:44 2008
@@ -10,9 +10,17 @@ OBJS += $(OBJS-yes) @@ -10,9 +10,17 @@ OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes)
CPP_OBJS += $(CPP_OBJS-yes) CPP_OBJS += $(CPP_OBJS-yes)
-CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+CFLAGS += -DHAVE_AV_CONFIG_H \ +CFLAGS := -DHAVE_AV_CONFIG_H \
-D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \
- -I$(SRC_PATH)/libavutil $(OPTFLAGS) - -I$(SRC_PATH)/libavutil $(OPTFLAGS)
+ -I$(SRC_PATH)/libavutil + -I$(SRC_PATH)/libavutil $(CFLAGS)
+ +
+ifeq ($(ARCH_X86),yes) +ifeq ($(ARCH_X86),yes)
+CFLAGS += -fomit-frame-pointer +CFLAGS += -fomit-frame-pointer

6
x11/mplayer/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.22 2008/02/08 17:32:42 jakemsr Exp $ @comment $OpenBSD: PLIST,v 1.23 2008/07/09 02:19:36 jakemsr Exp $
bin/mencoder @bin bin/mencoder
bin/mplayer @bin bin/mplayer
@man man/man1/mencoder.1 @man man/man1/mencoder.1
@man man/man1/mplayer.1 @man man/man1/mplayer.1
share/doc/mplayer/ share/doc/mplayer/