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

- add a workaround to prevent mencoder crashing in several places

Browse Source 
ok biorn@ (maintainer)
This commit is contained in:
ajacoutot 2007-11-12 07:08:24 +00:00
parent 0914ac8ff9
commit a922a320c5
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.121 2007/11/09 15:49:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.122 2007/11/12 07:08:24 ajacoutot Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm
@ -7,7 +7,7 @@ COMMENT= movie player supporting MPEG, DivX, AVI, ASF, MOV & more
DISTNAME= MPlayer-1.0pre8
DIST_SUBDIR= mplayer
PKGNAME= ${DISTNAME:L}p15
PKGNAME= ${DISTNAME:L}p16
CATEGORIES= x11
EXTRACT_SUFX= .tar.bz2
@ -174,6 +174,7 @@ CONFIGURE_ARGS+=--disable-mad
.endif
.if ${MACHINE_ARCH:Mi386}
PATCH_LIST= patch-* i386-patch-postproc_Makefile
CONFIGURE_ARGS+=--with-win32libdir=${LOCALBASE}/lib/win32 \
--enable-qtx \
--with-reallibdir=${LOCALBASE}/lib/win32

13
x11/mplayer/patches/i386-patch-postproc_Makefile Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: i386-patch-postproc_Makefile,v 1.1 2007/11/12 07:08:24 ajacoutot Exp $
--- postproc/Makefile.orig Sun Jun 11 20:35:46 2006
+++ postproc/Makefile Sun Nov 11 11:21:43 2007
@@ -11,7 +11,8 @@ ifeq ($(TARGET_ALTIVEC),yes)
SWSOBJS += yuv2rgb_altivec.o
endif
-CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
+# XXX add "-O -fomit-frame-pointer" to prevent a mencoder crash in hScale_MMX2
+CFLAGS = $(OPTFLAGS) -O -fomit-frame-pointer $(MLIB_INC) -I. -I.. $(EXTRA_INC)
# -I/usr/X11R6/include/
.SUFFIXES: .c .o

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

@ -0,0 +1,13 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.6 2007/11/12 07:08:24 ajacoutot Exp $
--- libavcodec/Makefile.orig Sun Nov 11 11:15:01 2007
+++ libavcodec/Makefile Sun Nov 11 11:18:26 2007
@@ -5,7 +5,8 @@
include ../config.mak
# NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
+# XXX add "-O -fomit-frame-pointer" to prevent random crashes from mencoder
+CFLAGS=$(OPTFLAGS) -O -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
OBJS= bitstream.o utils.o mem.o allcodecs.o \
mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\