mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 11:03:09 -04:00
50 lines
1.5 KiB
Text
50 lines
1.5 KiB
Text
--- configure.orig 2020-03-31 11:10:53 UTC
|
|
+++ configure
|
|
@@ -60,7 +60,7 @@ LOCAL_SAVEDIR=false
|
|
|
|
SDL_CONFIG=sdl2-config
|
|
SMPEG_CONFIG=smpeg2-config
|
|
-FREETYPE_CONFIG=freetype-config
|
|
+FREETYPE_CONFIG="pkg-config freetype2"
|
|
EXTLIB=./extlib
|
|
SRC=src
|
|
MAKEFILE=$SRC/Makefile
|
|
@@ -637,7 +637,7 @@ then
|
|
_EOF
|
|
INTERNAL_SDL_MIXER=true
|
|
$CXX `$SDL_CONFIG --cflags` test.cc `$SDL_CONFIG --libs` -lSDL2_mixer -o mtest >/dev/null 2>&1
|
|
- ./mtest 2>/dev/null
|
|
+ true 2>/dev/null
|
|
case $? in
|
|
0) echo "yes"; INTERNAL_SDL_MIXER=false ;;
|
|
1) echo "no MP3" ;; 2) echo "no Ogg" ;; 3) echo "no Ogg or MP3" ;;
|
|
@@ -725,7 +725,7 @@ then
|
|
FREETYPE_CONFIG=$EXTLIB/bin/freetype-config
|
|
else
|
|
$echo_n "Checking for system Freetype... ${nobr}"
|
|
- VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null`
|
|
+ VER=2
|
|
if [ -z "$VER" ]; then
|
|
FREETYPE_CONFIG=freetype2-config
|
|
VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null`
|
|
@@ -780,7 +780,7 @@ fi
|
|
|
|
if $WITH_LIBNOTIFY; then
|
|
$echo_n "Checking for system libnotify... ${nobr}"
|
|
- if `pkg-config --exists libnotify` && `pkg-config --exists gtk+-2.0`; then
|
|
+ if `pkg-config --exists libnotify`; then
|
|
echo "yes"
|
|
WITH_LIBNOTIFY=true
|
|
else
|
|
@@ -865,9 +865,8 @@ NOTIFYLIBS=
|
|
GTKLIBS=
|
|
if $WITH_LIBNOTIFY
|
|
then
|
|
- OURLIBS="$OURLIBS -lnotify"
|
|
- OURLIBS="$OURLIBS `pkg-config --libs gtk+-2.0`"
|
|
- OURINCS="$OURINCS `pkg-config --cflags gtk+-2.0`"
|
|
+ OURINCS="$OURINCS `pkg-config --cflags libnotify`"
|
|
+ OURLIBS="$OURLIBS `pkg-config --libs libnotify`"
|
|
OURDEFS="$OURDEFS -DLIBNOTIFY"
|
|
fi
|
|
|