Date: Thu, 25 Oct 2012 20:46:39 GMT From: Grzegorz Blach <magik@roorback.net> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/173085: multimedia/mplayer2: build fixes Message-ID: <201210252046.q9PKkdsY066806@red.freebsd.org> Resent-Message-ID: <201210252050.q9PKo2cS003285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173085
>Category: misc
>Synopsis: multimedia/mplayer2: build fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 25 20:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Grzegorz Blach
>Release: 9.1-PRERELEASE
>Organization:
>Environment:
FreeBSD silver.nine 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #8 r241394: Wed Oct 10 19:25:27 CEST 2012 root@silver.nine:/usr/obj/usr/src/sys/SILVER amd64
>Description:
- Fix build when multimedia/ffmpeg is already installed
- Fix pkg-plist when WITHOUT_NLS knob is set
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN multimedia/mplayer2/Makefile multimedia/mplayer2/Makefile
--- multimedia/mplayer2/Makefile 2012-10-24 18:32:17.000000000 +0200
+++ multimedia/mplayer2/Makefile 2012-10-25 22:36:04.000000000 +0200
@@ -2,6 +2,7 @@
PORTNAME= mplayer2
PORTVERSION= ${MPLAYER2_PORT_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://files.roorback.net/
@@ -10,9 +11,10 @@
LICENSE= GPLv2
-LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg-011 \
- png15:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS= ffmpeg-011:${PORTSDIR}/multimedia/ffmpeg-011
+RUN_DEPENDS= ffmpeg-011:${PORTSDIR}/multimedia/ffmpeg-011
USE_XZ= yes
USE_GMAKE= yes
@@ -101,8 +103,10 @@
CONFIGURE_ARGS+= --enable-translation --language=all \
--extra-libs-mplayer=-lintl
MANLANG= "" cs de es fr hu it pl ru zh_CN
+PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-translation --language=en
+PLIST_SUB+= NLS="@comment "
.endif
#On i386, gcc runs out of general purpose registers when
diff -ruN multimedia/mplayer2/pkg-plist multimedia/mplayer2/pkg-plist
--- multimedia/mplayer2/pkg-plist 2012-10-24 18:32:17.000000000 +0200
+++ multimedia/mplayer2/pkg-plist 2012-10-25 18:52:23.000000000 +0200
@@ -3,21 +3,21 @@
etc/mplayer/input.conf.sample
etc/mplayer/mplayer.conf.sample
@dirrmtry etc/mplayer
-@dirrmtry man/cs/man1
-@dirrmtry man/cs
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/hu/man1
-@dirrmtry man/hu
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/pl/man1
-@dirrmtry man/pl
-@dirrmtry man/ru/man1
-@dirrmtry man/ru
-@dirrmtry man/zh_CN/man1
-@dirrmtry man/zh_CN
+%%NLS%%@dirrmtry man/cs/man1
+%%NLS%%@dirrmtry man/cs
+%%NLS%%@dirrmtry man/de/man1
+%%NLS%%@dirrmtry man/de
+%%NLS%%@dirrmtry man/es/man1
+%%NLS%%@dirrmtry man/es
+%%NLS%%@dirrmtry man/fr/man1
+%%NLS%%@dirrmtry man/fr
+%%NLS%%@dirrmtry man/hu/man1
+%%NLS%%@dirrmtry man/hu
+%%NLS%%@dirrmtry man/it/man1
+%%NLS%%@dirrmtry man/it
+%%NLS%%@dirrmtry man/pl/man1
+%%NLS%%@dirrmtry man/pl
+%%NLS%%@dirrmtry man/ru/man1
+%%NLS%%@dirrmtry man/ru
+%%NLS%%@dirrmtry man/zh_CN/man1
+%%NLS%%@dirrmtry man/zh_CN
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210252046.q9PKkdsY066806>