mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-27 00:57:50 +00:00
Prevent accidental linking to libEGL
Reported by: Florian Degner <f.degner@gmx.de> via personal mail MFH: 2015Q1
This commit is contained in:
parent
fb231e1650
commit
449a649bbd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=382481
@ -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 <stdio.h>
|
||||
#include <cdio/version.h>
|
||||
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user