From owner-svn-ports-all@FreeBSD.ORG Sat Mar 28 13:35:03 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B168787; Sat, 28 Mar 2015 13:35:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BCDA344; Sat, 28 Mar 2015 13:35:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SDZ36k042063; Sat, 28 Mar 2015 13:35:03 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SDZ3QH042062; Sat, 28 Mar 2015 13:35:03 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201503281335.t2SDZ3QH042062@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 28 Mar 2015 13:35:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382481 - head/multimedia/mplayer/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2015 13:35:03 -0000 Author: riggs Date: Sat Mar 28 13:35:02 2015 New Revision: 382481 URL: https://svnweb.freebsd.org/changeset/ports/382481 QAT: https://qat.redports.org/buildarchive/r382481/ Log: Prevent accidental linking to libEGL Reported by: Florian Degner via personal mail MFH: 2015Q1 Modified: head/multimedia/mplayer/files/patch-configure Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Sat Mar 28 12:42:08 2015 (r382480) +++ head/multimedia/mplayer/files/patch-configure Sat Mar 28 13:35:02 2015 (r382481) @@ -1,5 +1,5 @@ --- configure.orig 2014-12-17 22:02:44.000000000 +0100 -+++ configure 2015-01-24 17:13:38.903362604 +0100 ++++ configure 2015-03-28 13:56:41.340987552 +0100 @@ -646,7 +646,7 @@ _iwmmxt=auto _mtrr=auto @@ -113,7 +113,23 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -6046,7 +6056,7 @@ +@@ -5474,15 +5484,6 @@ + break + fi + done +- if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then +- _gl=yes +- _gl_egl_x11=yes +- libs_mplayer="$libs_mplayer -lEGL $ld_dl" +- elif cc_check -DGL_EGL_ANDROID -lEGL ; then +- _gl=yes +- _gl_egl_android=yes +- libs_mplayer="$libs_mplayer -lEGL $ld_dl" +- fi + if win32 && cc_check -DGL_WIN32 -lopengl32 ; then + _gl=yes + _gl_win32=yes +@@ -6046,7 +6047,7 @@ elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -122,7 +138,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6059,7 +6069,7 @@ +@@ -6059,7 +6060,7 @@ default_cdrom_device="/dev/cdrom" fi @@ -131,7 +147,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6133,8 +6143,8 @@ +@@ -6133,8 +6134,8 @@ cat > $TMPC << EOF #include #include @@ -142,7 +158,7 @@ int main(void) { void *test = cdda_verbose_set; printf("%s\n", CDIO_VERSION); -@@ -6566,7 +6576,7 @@ +@@ -6566,7 +6567,7 @@ echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -151,7 +167,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7051,6 +7061,16 @@ +@@ -7051,6 +7052,16 @@ nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -168,7 +184,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7450,7 +7470,7 @@ +@@ -7450,7 +7461,7 @@ echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -177,7 +193,7 @@ fi echores "$_mencoder" -@@ -8329,7 +8349,7 @@ +@@ -8329,7 +8340,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe