Attachment #185895 for bug #221899




		libyajl.so:devel/yajl
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3

ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
KODI_ARCH_i386=	x86
KODI_ARCH_amd64=x86_64
KODI_ARCH_armv6=armv6
KODI_ARCH_armv7=armv7

USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
		libtool pkgconfig python:-2.7 ssl

OPTIONS_SINGLE_RPI=	RPI1 RPI2

OPTIONS_EXCLUDE_armv6=	LIRC VAAPI VDPAU
OPTIONS_EXCLUDE_armv7=	LIRC VAAPI VDPAU
OPTIONS_EXCLUDE_amd64=	RPI1 RPI2
OPTIONS_EXCLUDE_i386=	RPI1 RPI2


OPTIONS_DEFAULT=	AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC \
		MYSQL NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER
OPTIONS_DEFAULT_armv6=	RPI1
OPTIONS_DEFAULT_armv7=	RPI2

AIRPLAY_LIB_DEPENDS=	libplist.so:devel/libplist
AIRPLAY_CONFIGURE_ENABLE=	airplay


.include <bsd.port.pre.mk>

.if ${ARCH} != armv6 && ${ARCH} != armv7
BUILD_DEPENDS+=	gtk-update-icon-cache:x11-toolkits/gtk20
LIB_DEPENDS+=	libdrm.so:graphics/libdrm
RUN_DEPENDS+=	glxinfo:graphics/mesa-demos \

PLIST_SUB+=	ARM="@comment "
PLIST_SUB+=	X86=""
.else
# armv6 || armv7 (rpi1 and rpi2 only)
EXTRA_PATCHES=	${FILESDIR}/extra-armv6_hal
CONFIGURE_ARGS+=	--enable-player=omxplayer
LIB_DEPENDS+=	libEGL.so:misc/raspberrypi-userland \

	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin
	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' -or -name '*.xbs' -or -name '*.vis' \
		| ${XARGS} ${STRIP_CMD}
.if ${ARCH} != armv6 && ${ARCH} != armv7
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr
.endif





--- configure.ac.orig	2017-05-24 20:49:32.000000000 +0000
+++ configure.ac	2017-08-28 14:09:04.029056190 +0000
@@ -564,12 +564,36 @@
      CORE_SYSTEM_NAME=linux
      ARCH="x86-freebsd"
      MAKE="gmake"

+     use_gles=yes
+     use_gl=no
+     use_x11=no
+     ;;
+  armv7-*-freebsd*)
+     target_platform=target_linux
+     ARCH="armv7-freebsd"
+     MAKE="gmake"
+     USE_STATIC_FFMPEG=1
+     use_arch="arm"
+     use_neon=no
+     use_gles=yes
+     use_gl=no
+     use_x11=no
      ;;
   arm-apple-darwin*)
      CORE_SYSTEM_NAME=ios
@@ -688,7 +712,7 @@
      use_hardcoded_tables="yes"
      use_openmax=no
      CORE_SYSTEM_NAME=rbpi

      AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
      USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])
      USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])
@@ -759,10 +783,16 @@
 # platform specific flags
 if echo "$ARCH" | grep -q "freebsd" ; then
   LOCALBASE="${LOCALBASE:-/usr/local}"

 fi
 if test "$host_vendor" = "apple" ; then
   # standard application paths
@@ -802,8 +832,17 @@
     LIBS="$LIBS -framework CoreFoundation"
   fi
 elif test "$target_platform" = "target_raspberry_pi"; then

+  if test "$use_platform" = "raspberry-pi2"; then
+    CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
+    CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
+    ARCH="armv7-freebsd"
+    FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"
+  fi
+

 elif test "$use_arch" = "arm"; then
   CFLAGS="$CFLAGS -mno-apcs-stack-check"
   CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
@@ -921,6 +960,7 @@
 
 # Check inotify availability
 AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)

 
 # Python
 if test -z "$PYTHON_NOVERSIONCHECK"; then
@@ -1169,12 +1209,13 @@
 )
 
 #Check to see if libs are needed for functions that are often built-in to libc

 
 # platform dependent libraries
 if test "$host_vendor" = "apple" ; then
@@ -1558,7 +1599,7 @@
 
   if test "$cross_compiling" != "yes"; then
     if test "$use_debug" != "yes"; then

     fi
     if test "$use_optimizations" != "yes"; then
       FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
@@ -1569,7 +1610,7 @@
       SAVE_LIBS="$LIBS"
       # check for system installed ffmpeg. We require minimum versions.
       PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],

         [FFMPEG_FOUND="false"])
 
       if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
@@ -1596,7 +1637,11 @@
     elif test "$with_ffmpeg" = "force"; then
       # always build our ffmpeg
       AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")

       export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
 
     elif test "$with_ffmpeg" != "no"; then
@@ -1609,7 +1654,7 @@
 
 if test "$FFMPEG_FOUND" != "true"; then
   PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],

     [AC_MSG_ERROR("ffmpeg not found")])
 fi
 
@@ -1633,9 +1678,9 @@
 echo "Checking for SWIG installation"
 AC_PATH_PROG(SWIG_EXE, swig, "none")
 if test "$SWIG_EXE" = "none"; then

   fi
 fi
 if test "$SWIG_EXE" = "none"; then
@@ -1928,7 +1973,7 @@
   AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
     [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
   if test "$TEXTUREPACKER" = "none"; then

     TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
   fi
   if test -x "$TEXTUREPACKER"; then
@@ -2148,6 +2193,8 @@
   LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
 fi
 

Lines 4-10 Link Here

(-)multimedia/kodi/files/patch-m4_xbmc__arch.m4 (-2 / +2 lines)
4	amd64--freebsd)	4	amd64--freebsd)
5	AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")	5	AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")
6	;;	6	;;
7	+ armv6--freebsd)	7	+ armv--freebsd*)
8	+ AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")	8	+ AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")
9	+ ;;	9	+ ;;
10	86-apple-darwin*)	10	86-apple-darwin*)
Lines 14-20 Link Here
14	amd64--freebsd)	14	amd64--freebsd)
15	AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")	15	AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")
16	;;	16	;;
17	+ armv6--freebsd)	17	+ armv--freebsd*)
18	+ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")	18	+ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX")
19	+ ;;	19	+ ;;
20	arm-apple-darwin*)	20	arm-apple-darwin*)

Return to bug 221899

Lines 59-68 Link Here

(-)multimedia/kodi/Makefile (-4 / +7 lines)
59	libyajl.so:devel/yajl	59	libyajl.so:devel/yajl
60	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3	60	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
61		61
62	ONLY_FOR_ARCHS= amd64 armv6 i386	62	ONLY_FOR_ARCHS= amd64 armv6 armv7 i386
63	KODI_ARCH_i386= x86	63	KODI_ARCH_i386= x86
64	KODI_ARCH_amd64=x86_64	64	KODI_ARCH_amd64=x86_64
65	KODI_ARCH_armv6=armv6	65	KODI_ARCH_armv6=armv6
		66	KODI_ARCH_armv7=armv7
66		67
67	USES= autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \	68	USES= autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
68	libtool pkgconfig python:-2.7 ssl	69	libtool pkgconfig python:-2.7 ssl
Lines 98-103 Link Here
98	OPTIONS_SINGLE_RPI= RPI1 RPI2	99	OPTIONS_SINGLE_RPI= RPI1 RPI2
99		100
100	OPTIONS_EXCLUDE_armv6= LIRC VAAPI VDPAU	101	OPTIONS_EXCLUDE_armv6= LIRC VAAPI VDPAU
		102	OPTIONS_EXCLUDE_armv7= LIRC VAAPI VDPAU
101	OPTIONS_EXCLUDE_amd64= RPI1 RPI2	103	OPTIONS_EXCLUDE_amd64= RPI1 RPI2
102	OPTIONS_EXCLUDE_i386= RPI1 RPI2	104	OPTIONS_EXCLUDE_i386= RPI1 RPI2
103		105
Lines 112-117 Link Here
112	OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC \	114	OPTIONS_DEFAULT= AIRPLAY AIRTUNES AVAHI CEC LIBBLURAY LIRC \
113	MYSQL NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER	115	MYSQL NFS RTMP SFTP SMB VAAPI VDPAU WEBSERVER
114	OPTIONS_DEFAULT_armv6= RPI1	116	OPTIONS_DEFAULT_armv6= RPI1
		117	OPTIONS_DEFAULT_armv7= RPI2
115		118
116	AIRPLAY_LIB_DEPENDS= libplist.so:devel/libplist	119	AIRPLAY_LIB_DEPENDS= libplist.so:devel/libplist
117	AIRPLAY_CONFIGURE_ENABLE= airplay	120	AIRPLAY_CONFIGURE_ENABLE= airplay
Lines 170-176 Link Here
170		173
171	.include <bsd.port.pre.mk>	174	.include <bsd.port.pre.mk>
172		175
173	.if ${ARCH} != "armv6"	176	.if ${ARCH} != armv6 && ${ARCH} != armv7
174	BUILD_DEPENDS+= gtk-update-icon-cache:x11-toolkits/gtk20	177	BUILD_DEPENDS+= gtk-update-icon-cache:x11-toolkits/gtk20
175	LIB_DEPENDS+= libdrm.so:graphics/libdrm	178	LIB_DEPENDS+= libdrm.so:graphics/libdrm
176	RUN_DEPENDS+= glxinfo:graphics/mesa-demos \	179	RUN_DEPENDS+= glxinfo:graphics/mesa-demos \
Lines 182-188 Link Here
182	PLIST_SUB+= ARM="@comment "	185	PLIST_SUB+= ARM="@comment "
183	PLIST_SUB+= X86=""	186	PLIST_SUB+= X86=""
184	.else	187	.else
185	# armv6 (rpi1 and rpi2 only)	188	# armv6 \|\| armv7 (rpi1 and rpi2 only)
186	EXTRA_PATCHES= ${FILESDIR}/extra-armv6_hal	189	EXTRA_PATCHES= ${FILESDIR}/extra-armv6_hal
187	CONFIGURE_ARGS+= --enable-player=omxplayer	190	CONFIGURE_ARGS+= --enable-player=omxplayer
188	LIB_DEPENDS+= libEGL.so:misc/raspberrypi-userland \	191	LIB_DEPENDS+= libEGL.so:misc/raspberrypi-userland \
Lines 210-216 Link Here
210	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin	213	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi.bin
211	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '.so' -or -name '.xbs' -or -name '*.vis' \	214	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '.so' -or -name '.xbs' -or -name '*.vis' \
212	\| ${XARGS} ${STRIP_CMD}	215	\| ${XARGS} ${STRIP_CMD}
213	.if ${ARCH} != armv6	216	.if ${ARCH} != armv6 && ${ARCH} != armv7
214	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr	217	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/kodi/kodi-xrandr
215	.endif	218	.endif
216		219

Lines 1-6 Link Here

(-)multimedia/kodi/files/patch-configure.ac (-15 / +27 lines)
1	--- configure.ac.orig 2016-10-08 UTC	1	--- configure.ac.orig 2017-05-24 20:49:32.000000000 +0000
2	+++ configure.ac	2	+++ configure.ac 2017-08-28 14:09:04.029056190 +0000
3	@@ -564,12 +564,25 @@ case $host in	3	@@ -564,12 +564,36 @@
4	CORE_SYSTEM_NAME=linux	4	CORE_SYSTEM_NAME=linux
5	ARCH="x86-freebsd"	5	ARCH="x86-freebsd"
6	MAKE="gmake"	6	MAKE="gmake"
Lines 23-32 Link Here
23	+ use_gles=yes	23	+ use_gles=yes
24	+ use_gl=no	24	+ use_gl=no
25	+ use_x11=no	25	+ use_x11=no
		26	+ ;;
		27	+ armv7--freebsd)
		28	+ target_platform=target_linux
		29	+ ARCH="armv7-freebsd"
		30	+ MAKE="gmake"
		31	+ USE_STATIC_FFMPEG=1
		32	+ use_arch="arm"
		33	+ use_neon=no
		34	+ use_gles=yes
		35	+ use_gl=no
		36	+ use_x11=no
26	;;	37	;;
27	arm-apple-darwin*)	38	arm-apple-darwin*)
28	CORE_SYSTEM_NAME=ios	39	CORE_SYSTEM_NAME=ios
29	@@ -684,7 +697,7 @@ if test "$target_platform" = "target_ras	40	@@ -688,7 +712,7 @@
30	use_hardcoded_tables="yes"	41	use_hardcoded_tables="yes"
31	use_openmax=no	42	use_openmax=no
32	CORE_SYSTEM_NAME=rbpi	43	CORE_SYSTEM_NAME=rbpi
Lines 35-41 Link Here
35	AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])	46	AC_DEFINE(HAS_EGLGLES, [1], [Define if supporting EGL based GLES Framebuffer])
36	USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])	47	USE_OMXLIB=1; AC_DEFINE([HAVE_OMXLIB],[1],["Define to 1 if OMX libs is enabled"])
37	USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])	48	USE_MMAL=1; AC_DEFINE([HAS_MMAL],[1],["Define to 1 if MMAL libs is enabled"])
38	@@ -753,10 +766,16 @@ fi	49	@@ -759,10 +783,16 @@
39	# platform specific flags	50	# platform specific flags
40	if echo "$ARCH" \| grep -q "freebsd" ; then	51	if echo "$ARCH" \| grep -q "freebsd" ; then
41	LOCALBASE="${LOCALBASE:-/usr/local}"	52	LOCALBASE="${LOCALBASE:-/usr/local}"
Lines 55-61 Link Here
55	fi	66	fi
56	if test "$host_vendor" = "apple" ; then	67	if test "$host_vendor" = "apple" ; then
57	# standard application paths	68	# standard application paths
58	@@ -796,8 +815,16 @@ if test "$host_vendor" = "apple" ; then	69	@@ -802,8 +832,17 @@
59	LIBS="$LIBS -framework CoreFoundation"	70	LIBS="$LIBS -framework CoreFoundation"
60	fi	71	fi
61	elif test "$target_platform" = "target_raspberry_pi"; then	72	elif test "$target_platform" = "target_raspberry_pi"; then
Lines 67-72 Link Here
67	+ if test "$use_platform" = "raspberry-pi2"; then	78	+ if test "$use_platform" = "raspberry-pi2"; then
68	+ CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"	79	+ CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
69	+ CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"	80	+ CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
		81	+ ARCH="armv7-freebsd"
70	+ FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"	82	+ FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"
71	+ fi	83	+ fi
72	+	84	+
Lines 73-79 Link Here
73	elif test "$use_arch" = "arm"; then	85	elif test "$use_arch" = "arm"; then
74	CFLAGS="$CFLAGS -mno-apcs-stack-check"	86	CFLAGS="$CFLAGS -mno-apcs-stack-check"
75	CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"	87	CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
76	@@ -915,6 +942,7 @@ AC_LANG_POP([C++])	88	@@ -921,6 +960,7 @@
77		89
78	# Check inotify availability	90	# Check inotify availability
79	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)	91	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
Lines 81-87 Link Here
81		93
82	# Python	94	# Python
83	if test -z "$PYTHON_NOVERSIONCHECK"; then	95	if test -z "$PYTHON_NOVERSIONCHECK"; then
84	@@ -1163,12 +1191,13 @@ AS_CASE([x$use_libbluray],	96	@@ -1169,12 +1209,13 @@
85	)	97	)
86		98
87	#Check to see if libs are needed for functions that are often built-in to libc	99	#Check to see if libs are needed for functions that are often built-in to libc
Lines 96-102 Link Here
96		108
97	# platform dependent libraries	109	# platform dependent libraries
98	if test "$host_vendor" = "apple" ; then	110	if test "$host_vendor" = "apple" ; then
99	@@ -1552,7 +1581,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th	111	@@ -1558,7 +1599,7 @@
100		112
101	if test "$cross_compiling" != "yes"; then	113	if test "$cross_compiling" != "yes"; then
102	if test "$use_debug" != "yes"; then	114	if test "$use_debug" != "yes"; then
Lines 105-111 Link Here
105	fi	117	fi
106	if test "$use_optimizations" != "yes"; then	118	if test "$use_optimizations" != "yes"; then
107	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"	119	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
108	@@ -1563,7 +1592,7 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th	120	@@ -1569,7 +1610,7 @@
109	SAVE_LIBS="$LIBS"	121	SAVE_LIBS="$LIBS"
110	# check for system installed ffmpeg. We require minimum versions.	122	# check for system installed ffmpeg. We require minimum versions.
111	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],	123	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
Lines 114-120 Link Here
114	[FFMPEG_FOUND="false"])	126	[FFMPEG_FOUND="false"])
115		127
116	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then	128	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
117	@@ -1590,7 +1619,11 @@ if test "${USE_STATIC_FFMPEG}" = "1"; th	129	@@ -1596,7 +1637,11 @@
118	elif test "$with_ffmpeg" = "force"; then	130	elif test "$with_ffmpeg" = "force"; then
119	# always build our ffmpeg	131	# always build our ffmpeg
120	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")	132	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
Lines 127-133 Link Here
127	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"	139	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
128		140
129	elif test "$with_ffmpeg" != "no"; then	141	elif test "$with_ffmpeg" != "no"; then
130	@@ -1603,7 +1636,7 @@ fi	142	@@ -1609,7 +1654,7 @@
131		143
132	if test "$FFMPEG_FOUND" != "true"; then	144	if test "$FFMPEG_FOUND" != "true"; then
133	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],	145	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
Lines 136-142 Link Here
136	[AC_MSG_ERROR("ffmpeg not found")])	148	[AC_MSG_ERROR("ffmpeg not found")])
137	fi	149	fi
138		150
139	@@ -1627,9 +1660,9 @@ fi	151	@@ -1633,9 +1678,9 @@
140	echo "Checking for SWIG installation"	152	echo "Checking for SWIG installation"
141	AC_PATH_PROG(SWIG_EXE, swig, "none")	153	AC_PATH_PROG(SWIG_EXE, swig, "none")
142	if test "$SWIG_EXE" = "none"; then	154	if test "$SWIG_EXE" = "none"; then
Lines 149-155 Link Here
149	fi	161	fi
150	fi	162	fi
151	if test "$SWIG_EXE" = "none"; then	163	if test "$SWIG_EXE" = "none"; then
152	@@ -1922,7 +1955,7 @@ if test "x$use_texturepacker" != "xno";	164	@@ -1928,7 +1973,7 @@
153	AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],	165	AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
154	[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])	166	[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
155	if test "$TEXTUREPACKER" = "none"; then	167	if test "$TEXTUREPACKER" = "none"; then
Lines 158-164 Link Here
158	TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"	170	TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
159	fi	171	fi
160	if test -x "$TEXTUREPACKER"; then	172	if test -x "$TEXTUREPACKER"; then
161	@@ -2142,6 +2175,8 @@ if test "$host_vendor" = "apple" ; then	173	@@ -2148,6 +2193,8 @@
162	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"	174	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
163	fi	175	fi
164		176