Date: Thu, 28 Jul 2011 07:40:21 -0400 From: "b. f." <bf1783@googlemail.com> To: Mario Sergio Fujikawa Ferreira <lioux@freebsd.org> Cc: Doug Barton <dougb@freebsd.org>, cvs-all@freebsd.org, ports-committers@freebsd.org, riggs@rrr.de, "Philip M. Gollucci" <pgollucci@p6m7g8.com>, cvs-ports@freebsd.org Subject: Re: cvs commit: ports/multimedia/mencoder Makefile Message-ID: <CAGFTUwOU_PXVS4agENXow%2Bm1nzYEL_Qa09ZELwy7xqE=j9HO3w@mail.gmail.com> In-Reply-To: <CAGFTUwM=-hMoA=kEt3vtzG1n7WG2xeD5g=6OoqVXH6QHSGhs-A@mail.gmail.com> References: <201107200252.p6K2qZRb053515@repoman.freebsd.org> <CAGFTUwMZ5iAp=VvNZezX4fiGy2d5Ep6jaSWWUZp92KTobxkjsQ@mail.gmail.com> <4E2B2B82.1020506@FreeBSD.org> <4E2D7EEC.8030600@p6m7g8.com> <20110726025646.74097.qmail@exxodus.fedaykin.here> <20110726032009.23147.qmail@exxodus.fedaykin.here> <CAGFTUwM=-hMoA=kEt3vtzG1n7WG2xeD5g=6OoqVXH6QHSGhs-A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On 7/26/11, b. f. <bf1783@googlemail.com> wrote:
> On 7/25/11, Mario Sergio Fujikawa Ferreira <lioux@freebsd.org> wrote:
...
>>
>> Let's remove the OPTIONS ASS (for libass) entry AND let's simply
>> depend on multimedia/libass.
>>
>> It is simple and fulfills every criteria:
>>
>> 1) port is going to build
>>
>> 2) no option will be ignored
>>
>> 3) POLA is upheld since the port was built with ASS subtitle
>> support before and it will continue to be. The only difference
>> is that it will always use an external library instead of the
>> internal one.
>>
>> Let me know what you think. A multimedia/mencoder patch is attached
>> as a suggestion. Is this compromise acceptable?
>
> This would be better than the current state of the port, but I'd
> prefer my earlier patch, because multimedia/libass drags in some other
> dependencies, among them converters/recode, which I'd rather avoid,
> because it has some unpatched bugs, including an overly-wide bitfield
> that causes builds with newer versions of gcc to fail.
So, specifically, I'm suggesting something like the attached patch,
which allows those of us who don't need libass to avoid unnecessary
and problematic dependencies, as in your original commit, but avoids
overriding user options. It sets the ASS option to be on by default,
to address your POLA concerns. It also includes fixes for the other
problems with these two ports that I mentioned, portrevision bumps,
and your tweaks for the pkgconfig dependency.
>
> Again, I must ask, what makes you think that the mplayer configure
> script is defective? As I said earlier, I cannot reproduce the
> problem. Could you provide some more information? And, even if it
> is, what prevents us from simply patching it?
>
> Also, what about fixing the fragile piece of code that I pointed out,
> and the enca autodetection?
>
[-- Attachment #2 --]
Index: mplayer/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.207
diff -u -r1.207 Makefile
--- mplayer/Makefile 20 Jul 2011 02:52:21 -0000 1.207
+++ mplayer/Makefile 28 Jul 2011 05:12:10 -0000
@@ -7,7 +7,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/Makefile.shared"
@@ -51,7 +51,7 @@
OPTIONS+= THEORA "Enable ogg theora video support" off
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
-OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" Off
+OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" on
.if !defined(PACKAGE_BUILDING)
OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
.endif
@@ -74,12 +74,6 @@
CONFFILES= example.conf input.conf menu.conf dvb-menu.conf
-# fix for bug when libass is installed, mplayer configure does not
-# uphold --disable-ass
-.if exists(${LOCALBASE}/lib/libass.so)
-WITH_ASS= yes
-.endif
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "sparc64"
@@ -102,10 +96,10 @@
.if defined(WITH_ASS)
LIB_DEPENDS+= ass.5:${PORTSDIR}/multimedia/libass
-USE_GNOME+= pkgconfig
+BUILD_DEPENDS += pkg-config:${PORTSDIR}/devel/pkg-config
LIBASS_PKGCONFIG_CFLAGS= pkg-config --cflags --silence-errors libass
.else
-CONFIGURE_ARGS+= --disable-ass --disable-ass-internal
+CONFIGURE_ARGS+= --disable-ass --disable-ass-internal --disable-enca
LIBASS_PKGCONFIG_CFLAGS= ${ECHO_CMD}
.endif
Index: mplayer/files/patch-sub__subreader.c
===================================================================
RCS file: mplayer/files/patch-sub__subreader.c
diff -N mplayer/files/patch-sub__subreader.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mplayer/files/patch-sub__subreader.c 23 Jul 2011 03:27:50 -0000
@@ -0,0 +1,13 @@
+--- sub/subreader.c.orig 2011-07-22 23:08:52.000000000 -0400
++++ sub/subreader.c 2011-07-22 23:26:15.000000000 -0400
+@@ -2509,8 +2509,10 @@
+ strip_markup = 1;
+ #endif
+ if (!strip_markup) {
++#ifdef CONFIG_ASS
+ subassconvert_subrip(txt, buf, MAX_SUBLINE + 1);
+ sub->text[sub->lines] = buf;
++#endif
+ } else {
+ for (i = 0; i < len && pos < MAX_SUBLINE; i++) {
+ char c = txt[i];
Index: mencoder/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mencoder/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- mencoder/Makefile 20 Jul 2011 02:52:34 -0000 1.28
+++ mencoder/Makefile 28 Jul 2011 05:23:40 -0000
@@ -6,7 +6,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
COMMENT= Convenient video file and movie encoder
RESTRICTED= Port has restricted dependencies
@@ -41,7 +41,7 @@
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= DIRAC "Enable dirac video codec support" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
-OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" Off
+OPTIONS+= ASS "Enable ASS/SSA subtitle rendering" on
OPTIONS+= REALPLAYER "Enable real player plugin" off
OPTIONS+= LIVEMEDIA "Enable LIVE555 streaming support" off
OPTIONS+= SMB "Enable Samba input support" off
@@ -65,12 +65,6 @@
psnr-video.sh qepdvcd.sh subedit.pl \
subsearch.sh w32codec_dl.pl wma2ogg.pl \
-# fix for bug when libass is installed, mplayer configure does not
-# uphold --disable-ass
-.if exists(${LOCALBASE}/lib/libass.so)
-WITH_ASS= yes
-.endif
-
.include <bsd.port.pre.mk>
LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
@@ -99,10 +93,10 @@
.if defined(WITH_ASS)
LIB_DEPENDS+= ass.5:${PORTSDIR}/multimedia/libass
-USE_GNOME+= pkgconfig
+BUILD_DEPENDS += pkg-config:${PORTSDIR}/devel/pkg-config
LIBASS_PKGCONFIG_CFLAGS= pkg-config --cflags --silence-errors libass
.else
-CONFIGURE_ARGS+= --disable-ass --disable-ass-internal
+CONFIGURE_ARGS+= --disable-ass --disable-ass-internal --disable-enca
LIBASS_PKGCONFIG_CFLAGS= ${ECHO_CMD}
.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGFTUwOU_PXVS4agENXow%2Bm1nzYEL_Qa09ZELwy7xqE=j9HO3w>