Date: Sat, 28 Jan 2012 17:35:12 GMT From: Thomas Zander <thomas.e.zander@googlemail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/164580: Fix mplayer builds on 8.2-RELEASE-pX and earlier Message-ID: <201201281735.q0SHZCBH082358@red.freebsd.org> Resent-Message-ID: <201201281740.q0SHe7GY029599@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164580
>Category: ports
>Synopsis: Fix mplayer builds on 8.2-RELEASE-pX and earlier
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 28 17:40:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Thomas Zander
>Release:
>Organization:
>Environment:
>Description:
Update to the mplayer + mencoder ports to address the following issues:
- Does not build if no log2 and log2f is present on the system (before OSVERSION 802502, that is): Introduced a new EXTRA_PATCHES in files/extra-patch-base_system_log2f to address the issue.
- Remove unixfreunde.de from MASTER_SITES, since it is not used anymore.
@Committer: I do have a MASTER_SITES problem here since rrr.de is not intended to serve these GET requests from around the whole world. Does the FreeBSD project have space for these distfiles and a proper way of allowing me to put them there now and in future?
>How-To-Repeat:
>Fix:
Patch is attached.
Patch attached with submission follows:
diff -ruN /usr/ports/multimedia/mplayer/Makefile.options mplayer/Makefile.options
--- /usr/ports/multimedia/mplayer/Makefile.options 2012-01-25 11:11:48.000000000 +0100
+++ mplayer/Makefile.options 2012-01-28 17:40:02.997772646 +0100
@@ -29,6 +29,10 @@
# Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh
#
+.if ${OSVERSION} < 802502
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f
+.endif
+
.if defined(WITH_LANG)
CONFIGURE_ARGS+=--language=${WITH_LANG}
.endif
diff -ruN /usr/ports/multimedia/mplayer/Makefile.shared mplayer/Makefile.shared
--- /usr/ports/multimedia/mplayer/Makefile.shared 2012-01-15 23:31:53.000000000 +0100
+++ mplayer/Makefile.shared 2012-01-28 18:23:45.654453413 +0100
@@ -7,8 +7,7 @@
MPLAYER_SNAPSHOT_DATE= 2011-12-18
MPLAYER_PORT_VERSION= 1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio
-MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
- http://www.rrr.de/~riggs/mplayer/
+MASTER_SITES= http://www.rrr.de/~riggs/mplayer/
DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/rc/g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
diff -ruN /usr/ports/multimedia/mplayer/files/extra-patch-base_system_log2f mplayer/files/extra-patch-base_system_log2f
--- /usr/ports/multimedia/mplayer/files/extra-patch-base_system_log2f 1970-01-01 01:00:00.000000000 +0100
+++ mplayer/files/extra-patch-base_system_log2f 2012-01-28 17:36:15.426193356 +0100
@@ -0,0 +1,22 @@
+--- configure.orig 2011-12-15 15:01:05.000000000 +0100
++++ configure 2012-01-28 17:33:54.674887100 +0100
+@@ -3107,7 +3107,7 @@
+ echores "$_kstat"
+
+
+-for func in cbrtf exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf trunc truncf; do
++for func in cbrtf exp2 exp2f llrint llrintf lrint lrintf round roundf trunc truncf; do
+ echocheck $func
+ eval _$func=no
+ statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
+@@ -3119,7 +3119,9 @@
+ echores no
+ fi
+ done
+-
++for func in log2 log2f; do
++ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
++done
+
+ echocheck "mkstemp"
+ _mkstemp=no
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201281735.q0SHZCBH082358>