diff options
author | pav <pav@FreeBSD.org> | 2004-06-14 22:47:12 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2004-06-14 22:47:12 +0800 |
commit | a84b517e6e40317e5201ae1eb63ce6572e1e1515 (patch) | |
tree | 635d76d788bb465cac2adc35d4dc3f78e153d1c4 /multimedia/mplayer | |
parent | b0e95922fbbd7949c808aacf5edb367fe35a50dc (diff) | |
download | freebsd-ports-gnome-a84b517e6e40317e5201ae1eb63ce6572e1e1515.tar.gz freebsd-ports-gnome-a84b517e6e40317e5201ae1eb63ce6572e1e1515.tar.zst freebsd-ports-gnome-a84b517e6e40317e5201ae1eb63ce6572e1e1515.zip |
- Autodetect fribidi
- Enable OSD
- Disable caca
- Fix build with gtk1
Submitted by: Thomas E. Zander <riggs@rrr.de>
PR: 67846, 67873, 67875, 67913, 67923
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r-- | multimedia/mplayer/Makefile | 29 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-vidix-drivers-Makefile | 67 |
2 files changed, 92 insertions, 4 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 6cc3371a8db5..6a653daa148d 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -135,6 +135,9 @@ # because of conflicting glib versions, so it it is disabled if # mplayer is built with gtk1 graphical user interface # +# WITH_FRIBIDI +# default: autodetect +# # WITH_CDPARANOIA # default: autodetect # @@ -204,6 +207,7 @@ PORTNAME= mplayer PORTVERSION= 0.99.4 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \ http://www2.mplayerhq.hu/MPlayer/releases/ \ @@ -235,9 +239,11 @@ CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ --with-x11libdir=${X11BASE}/lib \ --with-x11incdir=${X11BASE}/include \ --enable-png \ + --enable-menu \ --disable-libfame \ --disable-external-faad \ - --disable-tv-v4l + --disable-tv-v4l \ + --disable-caca .if defined(WITH_LANG) CONFIGURE_ARGS+=--language=${WITH_LANG} @@ -272,6 +278,10 @@ PLIST_SUB+= VIDIX="@comment " #WITH_RTC= yes #.endif +.if exists(${LOCALBASE}/lib/libfribidi.so.0) +WITH_FRIBIDI= yes +.endif + .if exists(${LOCALBASE}/lib/libartsc.so.0) WITH_ARTS= yes .endif @@ -357,7 +367,7 @@ CONFIGURE_ARGS+= --enable-debug CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif -.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GUI) && !defined(WITH_GTK2) +.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GUI) WITH_GTK1= yes .endif @@ -419,6 +429,13 @@ CONFIGURE_ARGS+= --enable-arts CONFIGURE_ARGS+= --disable-arts .endif +.if defined(WITH_FRIBIDI) +LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi +CONFIGURE_ARGS+= --enable-fribidi +.else +CONFIGURE_ARGS+= --disable-fribidi +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia .else @@ -452,9 +469,9 @@ CONFIGURE_ARGS+= --disable-mad .if defined(WITH_MATROSKA) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska -CONFIGURE_ARGS+= --enable-matroska +CONFIGURE_ARGS+= --enable-external-matroska .else -CONFIGURE_ARGS+= --disable-matroska +CONFIGURE_ARGS+= --disable-external-matroska .endif .if defined(WITH_SVGALIB) @@ -607,6 +624,10 @@ pre-everything:: @${ECHO_MSG} "make WITH_GTK1 @${ECHO_MSG} "builds MPlayer with GTK1-GUI support." +.if defined(WITH_GTK2) && !defined(WITHOUT_GUI) + @${ECHO_MSG} "GTK2 plugin is not available at the moment." + @${ECHO_MSG} "Falling back to use GTK1 if installed on the system." +.endif .if !defined(WITHOUT_GUI) @${ECHO_MSG} "If you want to use the GUI, you can either install" @${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins" diff --git a/multimedia/mplayer/files/patch-vidix-drivers-Makefile b/multimedia/mplayer/files/patch-vidix-drivers-Makefile new file mode 100644 index 000000000000..f131e51a1cca --- /dev/null +++ b/multimedia/mplayer/files/patch-vidix-drivers-Makefile @@ -0,0 +1,67 @@ +--- vidix/drivers/Makefile.orig Wed Oct 22 18:45:33 2003 ++++ vidix/drivers/Makefile Mon Jun 14 15:23:29 2004 +@@ -8,55 +8,55 @@ + CYBERBLADE_SRCS=cyberblade_vid.c + CYBERBLADE_OBJS=cyberblade_vid.o + CYBERBLADE_LIBS=-L../../libdha -ldha -lm +-CYBERBLADE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++CYBERBLADE_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + RADEON_VID=radeon_vid.so + RADEON_SRCS=radeon_vid.c + RADEON_OBJS=radeon_vid.o + RADEON_LIBS=-L../../libdha -ldha -lm +-RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++RADEON_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + RAGE128_VID=rage128_vid.so + RAGE128_SRCS=radeon_vid.c + RAGE128_OBJS=rage128_vid.o + RAGE128_LIBS=-L../../libdha -ldha +-RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128 ++RAGE128_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128 + + PM3_VID=pm3_vid.so + PM3_SRCS=pm3_vid.c + PM3_OBJS=pm3_vid.o + PM3_LIBS=-L../../libdha -ldha +-PM3_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++PM3_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + MACH64_VID=mach64_vid.so + MACH64_SRCS=mach64_vid.c + MACH64_OBJS=mach64_vid.o + MACH64_LIBS=-L../../libdha -ldha +-MACH64_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128 ++MACH64_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128 + + MGA_VID=mga_vid.so + MGA_SRCS=mga_vid.c + MGA_OBJS=mga_vid.o + MGA_LIBS=-L../../libdha -ldha -lm +-MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++MGA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + MGA_CRTC2_VID=mga_crtc2_vid.so + MGA_CRTC2_SRCS=mga_vid.c + MGA_CRTC2_OBJS=mga_crtc2_vid.o + MGA_CRTC2_LIBS=-L../../libdha -ldha -lm +-MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DCRTC2 ++MGA_CRTC2_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DCRTC2 + + NVIDIA_VID=nvidia_vid.so + NVIDIA_SRCS=nvidia_vid.c + NVIDIA_OBJS=nvidia_vid.o + NVIDIA_LIBS=-L../../libdha -ldha -lm +-NVIDIA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++NVIDIA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + SIS_VID=sis_vid.so + SIS_SRCS=sis_vid.c sis_bridge.c + SIS_OBJS=sis_vid.o sis_bridge.o + SIS_LIBS=-L../../libdha -ldha +-SIS_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. ++SIS_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. + + all: $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) + |