mirror of
https://git.freebsd.org/ports.git
synced 2025-07-06 03:49:14 -04:00
- Add Python 2.7 support [2] - Minor Makefile cleanup - Bump PORTREVISION PR: ports/155403 Submitted by: Mickael Maillot <mickael.maillot@gmail.com> (maintainer), Juergen Lock <nox@FreeBSD.org> [1] Thanks to: Anonymous <swell.k@gmail.com> [2], Andriy Gapon <avg@FreeBSD.org> [2]
222 lines
7.8 KiB
Text
222 lines
7.8 KiB
Text
--- configure.in.orig 2010-12-17 07:17:41.000000000 +0100
|
|
+++ configure.in 2011-03-08 15:10:52.000000000 +0100
|
|
@@ -19,10 +19,10 @@
|
|
[
|
|
if [[ "$host_vendor" != "apple" ]]; then
|
|
AC_MSG_CHECKING([for lib$2 soname])
|
|
- $1_SONAME=$( $CC -print-file-name=lib$2.so | \
|
|
+ $1_SONAME=$( LIBRARY_PATH=/usr/local/lib $CC -print-file-name=lib$2.so | \
|
|
while read output; do objdump -p $output | \
|
|
grep "SONAME" | \
|
|
- sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
|
|
+ sed -e 's/ *SONAME *//'; done 2> /dev/null )
|
|
else
|
|
AC_MSG_CHECKING([for lib$2 dylib])
|
|
gcc_lib_path=[`$CC -print-search-dirs 2>/dev/null | fgrep libraries: | sed 's/[^=]*=\(.*\)/\1/' | sed 's/:/ /g'`]
|
|
@@ -294,6 +294,12 @@
|
|
[use_libbluray=$enableval],
|
|
[use_libbluray=auto])
|
|
|
|
+AC_ARG_ENABLE([libmms],
|
|
+ [AS_HELP_STRING([--enable-libmms],
|
|
+ [enable mms:// and mmsh:// support (default is auto)])],
|
|
+ [use_libmms=$enableval],
|
|
+ [use_libmms=auto])
|
|
+
|
|
AC_ARG_WITH([lirc-device],
|
|
[AS_HELP_STRING([--with-lirc-device=file],
|
|
[specify the default LIRC device (default is /dev/lircd)])],
|
|
@@ -359,6 +365,18 @@
|
|
x86_64-*-linux-gnu*)
|
|
ARCH="x86_64-linux"
|
|
;;
|
|
+ i386-*-freebsd*)
|
|
+ ARCH="x86-freebsd"
|
|
+ MAKE="gmake"
|
|
+ CFLAGS="$CFLAGS -I/usr/local/include"
|
|
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
|
|
+ ;;
|
|
+ amd64-*-freebsd*)
|
|
+ ARCH="x86_64-freebsd"
|
|
+ MAKE="gmake"
|
|
+ CFLAGS="$CFLAGS -I/usr/local/include"
|
|
+ CXXFLAGS="$CXXFLAGS -I/usr/local/include"
|
|
+ ;;
|
|
i386-apple-darwin*)
|
|
ARCH="x86-osx"
|
|
# define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor
|
|
@@ -507,6 +525,8 @@
|
|
# Add top source directory for all builds so we can use config.h
|
|
INCLUDES="$INCLUDES -I\$(abs_top_srcdir)"
|
|
|
|
+AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[""]),)
|
|
+
|
|
# Checks for boost headers using CXX instead of CC
|
|
AC_LANG_PUSH([C++])
|
|
AC_CHECK_HEADER([boost/shared_ptr.hpp],, AC_MSG_ERROR($missing_library))
|
|
@@ -543,7 +563,11 @@
|
|
AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no")
|
|
AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
|
|
+if echo "$ARCH" | grep -q freebsd; then
|
|
+AC_CHECK_LIB([pthread], [main],LIBS="-pthread $LIBS", AC_MSG_ERROR($missing_library))
|
|
+else
|
|
AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR($missing_library))
|
|
+fi
|
|
AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
|
|
@@ -581,9 +605,6 @@
|
|
PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
|
|
[INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
|
|
AC_MSG_ERROR($missing_library))
|
|
-PKG_CHECK_MODULES([MMS], [libmms],
|
|
- [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"],
|
|
- AC_MSG_ERROR($missing_library))
|
|
PKG_CHECK_MODULES([FREETYPE2], [freetype2],
|
|
[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
|
|
AC_MSG_ERROR($missing_library))
|
|
@@ -620,6 +641,29 @@
|
|
]
|
|
)
|
|
|
|
+# check for libmms
|
|
+AS_CASE([x$use_libmms],
|
|
+ [xyes],[
|
|
+ PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], AC_MSG_ERROR($missing_library))
|
|
+ ],
|
|
+ [xauto],[
|
|
+ PKG_CHECK_MODULES([LIBMMS],[libmms],[use_libmms="yes"], [use_libmms="no"])
|
|
+ ])
|
|
+
|
|
+AS_CASE([x$use_libmms],
|
|
+ [xyes],[
|
|
+ INCLUDES="$INCLUDES $LIBMMS_CFLAGS";
|
|
+ LIBS="$LIBS $LIBMMS_LIBS";
|
|
+ if test "$host_vendor" != "apple"; then
|
|
+ XB_FIND_SONAME([MMS], [mms], [use_libmms])
|
|
+ fi;
|
|
+ AC_DEFINE([HAVE_LIBMMS], 1, [System has libmms library])
|
|
+ AC_SUBST([HAVE_LIBMMS], 1)
|
|
+ ],[
|
|
+ AC_SUBST([HAVE_LIBMMS], 0)
|
|
+ ]
|
|
+)
|
|
+
|
|
# platform dependent libraries
|
|
if test "$host_vendor" = "apple" ; then
|
|
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
|
|
@@ -644,8 +688,10 @@
|
|
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
|
|
+ if echo "$ARCH" | grep -vq freebsd; then
|
|
AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
|
|
+ fi
|
|
AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
|
|
AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
|
|
AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library))
|
|
@@ -740,8 +786,8 @@
|
|
AC_MSG_RESULT($faac_disabled)
|
|
else
|
|
if test "$use_faac" = "yes"; then
|
|
- AC_CHECK_LIB([faac], [main],,
|
|
- use_faac=no;AC_MSG_RESULT($faac_not_found))
|
|
+ AC_CHECK_LIB([faac], [main], LIBS="-lfaac -lstdc++ $LIBS",
|
|
+ use_faac=no;AC_MSG_RESULT($faac_not_found), [-lstdc++])
|
|
else
|
|
AC_MSG_RESULT($faac_disabled)
|
|
fi
|
|
@@ -919,7 +965,11 @@
|
|
|
|
# External Python
|
|
if test "$use_external_python" = "yes"; then
|
|
- AC_CHECK_LIB([python2.6], [main],
|
|
+ AC_CHECK_LIB([python2.7], [main],
|
|
+ [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
|
|
+ [Define to 1 if you have the 'python2.7' library.])
|
|
+ USE_PYTHON2_7=1],
|
|
+ [AC_CHECK_LIB([python2.6], [main],
|
|
[AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
|
|
[Define to 1 if you have the 'python2.6' library.])
|
|
USE_PYTHON2_6=1],
|
|
@@ -931,9 +981,10 @@
|
|
[AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
|
|
[Define to 1 if you have the 'python2.4' library.])
|
|
USE_PYTHON2_4=1],
|
|
- [AC_MSG_ERROR($missing_library)] )] )] )
|
|
+ [AC_MSG_ERROR($missing_library)] )] )] )] )
|
|
|
|
AC_MSG_NOTICE($external_python_enabled)
|
|
+ test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
|
|
test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
|
|
test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
|
|
test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
|
|
@@ -1211,6 +1262,12 @@
|
|
final_message="$final_message\n Bluray:\tNo"
|
|
fi
|
|
|
|
+if test "$use_libmms" = "yes"; then
|
|
+ final_message="$final_message\n MMS Support:\tYes"
|
|
+else
|
|
+ final_message="$final_message\n MMS Support:\tNo"
|
|
+fi
|
|
+
|
|
if test "$use_mid" = "yes"; then
|
|
final_message="$final_message\n MID Support:\tYes"
|
|
SDL_DEFINES="$SDL_DEFINES -DMID"
|
|
@@ -1418,7 +1475,6 @@
|
|
xbmc/cores/paplayer/NSFCodec/Makefile \
|
|
xbmc/cores/paplayer/SIDCodec/Makefile \
|
|
xbmc/cores/paplayer/vgmstream/Makefile \
|
|
- xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/Makefile \
|
|
xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
|
|
xbmc/cores/playercorefactory/Makefile \
|
|
xbmc/karaoke/Makefile \
|
|
@@ -1491,6 +1547,7 @@
|
|
AC_SUBST(USE_EXTERNAL_LIBMPEG2)
|
|
AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
|
|
AC_SUBST(USE_EXTERNAL_PYTHON)
|
|
+AC_SUBST(USE_PYTHON2_7)
|
|
AC_SUBST(USE_PYTHON2_6)
|
|
AC_SUBST(USE_PYTHON2_5)
|
|
AC_SUBST(USE_PYTHON2_4)
|
|
@@ -1735,7 +1792,7 @@
|
|
--enable-static \
|
|
--disable-shared \
|
|
--cc="$CC" &&
|
|
- make dvdread-config &&
|
|
+ $MAKE dvdread-config &&
|
|
mkdir -p `pwd`/../includes/dvdread
|
|
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
|
|
else
|
|
@@ -1749,8 +1806,9 @@
|
|
--disable-shared \
|
|
--disable-strip \
|
|
--disable-opts \
|
|
+ --make=$MAKE \
|
|
--cc="$CC" &&
|
|
- make dvdread-config &&
|
|
+ $MAKE dvdread-config &&
|
|
mkdir -p `pwd`/../includes/dvdread
|
|
cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
|
|
fi
|
|
@@ -1766,6 +1824,17 @@
|
|
--enable-static \
|
|
--disable-shared \
|
|
--cc="$CC"
|
|
+ elif echo "$ARCH" | grep -q "freebsd" ; then
|
|
+ ./configure2 \
|
|
+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I/usr/local/include" \
|
|
+ --extra-ldflags="-L/usr/local/lib" \
|
|
+ --host=$host_alias \
|
|
+ --build=$build_alias \
|
|
+ --target=$target_alias \
|
|
+ --enable-static \
|
|
+ --disable-shared \
|
|
+ --make=$MAKE \
|
|
+ --cc="$CC"
|
|
else
|
|
./configure2 \
|
|
--extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
|