Attachment #187546 for bug #223292

View | Details | Raw Unified | Return to bug 223292
Collapse All | Expand All




--- configure.ac.orig	2017-05-25 08:49:32.000000000 +1200
+++ configure.ac	2017-10-28 22:32:23.769653000 +1300
@@ -564,12 +564,36 @@
      CORE_SYSTEM_NAME=linux
      ARCH="x86-freebsd"

 fi
 if test "$host_vendor" = "apple" ; then
   # standard application paths
@@ -802,8 +832,16 @@
     LIBS="$LIBS -framework CoreFoundation"
   fi
 elif test "$target_platform" = "target_raspberry_pi"; then
-  ARCH="arm"
+  CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include/interface/vcos/pthreads/ -I$LOCALBASE/include/interface/vcos -I$LOCALBASE/include/interface/ -I$LOCALBASE/include/interface/vmcs_host/linux"
+  ARCH="$(uname -p)-freebsd"
   use_arch="arm"
+  FFMPEG_OPTS="--cc=$CC --cxx=$CXX --disable-fast-unaligned --disable-vfp --disable-xlib --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape"
+  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 +959,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 +1208,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 +1598,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 +1609,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 +1636,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 +1653,7 @@
 
 if test "$FFMPEG_FOUND" != "true"; then
   PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],

     [AC_MSG_ERROR("ffmpeg not found")])
 fi
 
@@ -1633,9 +1677,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 +1972,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 +2192,8 @@
   LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
 fi
 

Return to bug 223292

Lines 1-5 Link Here

(-)files/patch-configure.ac (-14 / +13 lines)
1	--- configure.ac.orig 2017-05-24 20:49:32.000000000 +0000	1	--- configure.ac.orig 2017-05-25 08:49:32.000000000 +1200
2	+++ configure.ac 2017-08-28 14:09:04.029056190 +0000	2	+++ configure.ac 2017-10-28 22:32:23.769653000 +1300
3	@@ -564,12 +564,36 @@	3	@@ -564,12 +564,36 @@
4	CORE_SYSTEM_NAME=linux	4	CORE_SYSTEM_NAME=linux
5	ARCH="x86-freebsd"	5	ARCH="x86-freebsd"
Lines 66-91 Link Here
66	fi	66	fi
67	if test "$host_vendor" = "apple" ; then	67	if test "$host_vendor" = "apple" ; then
68	# standard application paths	68	# standard application paths
69	@@ -802,8 +832,17 @@	69	@@ -802,8 +832,16 @@
70	LIBS="$LIBS -framework CoreFoundation"	70	LIBS="$LIBS -framework CoreFoundation"
71	fi	71	fi
72	elif test "$target_platform" = "target_raspberry_pi"; then	72	elif test "$target_platform" = "target_raspberry_pi"; then
73	- ARCH="arm"	73	- ARCH="arm"
74	+ CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include/interface/vcos/pthreads/ -I$LOCALBASE/include/interface/vcos -I$LOCALBASE/include/interface/ -I$LOCALBASE/include/interface/vmcs_host/linux"	74	+ CXXFLAGS="$CXXFLAGS -I$LOCALBASE/include/interface/vcos/pthreads/ -I$LOCALBASE/include/interface/vcos -I$LOCALBASE/include/interface/ -I$LOCALBASE/include/interface/vmcs_host/linux"
75	+ ARCH="armv6-freebsd"	75	+ ARCH="$(uname -p)-freebsd"
76	use_arch="arm"	76	use_arch="arm"
77	+ FFMPEG_OPTS="--cc=$CC --cxx=$CXX --disable-fast-unaligned --disable-vfp --disable-xlib --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape"	77	+ FFMPEG_OPTS="--cc=$CC --cxx=$CXX --disable-fast-unaligned --disable-vfp --disable-xlib --disable-libxcb --disable-libxcb-shm --disable-libxcb-xfixes --disable-libxcb-shape"
78	+ if test "$use_platform" = "raspberry-pi2"; then	78	+ if test "$use_platform" = "raspberry-pi2"; then
79	+ CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"	79	+ CFLAGS="$CFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
80	+ CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"	80	+ CXXFLAGS="$CXXFLAGS -march=armv7a -mtune=cortex-a7 -mfpu=neon"
81	+ ARCH="armv7-freebsd"
82	+ FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"	81	+ FFMPEG_OPTS="${FFMPEG_OPTS} --enable-neon"
83	+ fi	82	+ fi
84	+	83	+
85	elif test "$use_arch" = "arm"; then	84	elif test "$use_arch" = "arm"; then
86	CFLAGS="$CFLAGS -mno-apcs-stack-check"	85	CFLAGS="$CFLAGS -mno-apcs-stack-check"
87	CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"	86	CXXFLAGS="$CXXFLAGS -mno-apcs-stack-check"
88	@@ -921,6 +960,7 @@	87	@@ -921,6 +959,7 @@
89		88
90	# Check inotify availability	89	# Check inotify availability
91	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)	90	AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[Define if we have inotify]),)
Lines 93-99 Link Here
93		92
94	# Python	93	# Python
95	if test -z "$PYTHON_NOVERSIONCHECK"; then	94	if test -z "$PYTHON_NOVERSIONCHECK"; then
96	@@ -1169,12 +1209,13 @@	95	@@ -1169,12 +1208,13 @@
97	)	96	)
98		97
99	#Check to see if libs are needed for functions that are often built-in to libc	98	#Check to see if libs are needed for functions that are often built-in to libc
Lines 108-114 Link Here
108		107
109	# platform dependent libraries	108	# platform dependent libraries
110	if test "$host_vendor" = "apple" ; then	109	if test "$host_vendor" = "apple" ; then
111	@@ -1558,7 +1599,7 @@	110	@@ -1558,7 +1598,7 @@
112		111
113	if test "$cross_compiling" != "yes"; then	112	if test "$cross_compiling" != "yes"; then
114	if test "$use_debug" != "yes"; then	113	if test "$use_debug" != "yes"; then
Lines 117-123 Link Here
117	fi	116	fi
118	if test "$use_optimizations" != "yes"; then	117	if test "$use_optimizations" != "yes"; then
119	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"	118	FFMPEG_OPTS="${FFMPEG_OPTS} --disable-optimizations"
120	@@ -1569,7 +1610,7 @@	119	@@ -1569,7 +1609,7 @@
121	SAVE_LIBS="$LIBS"	120	SAVE_LIBS="$LIBS"
122	# check for system installed ffmpeg. We require minimum versions.	121	# check for system installed ffmpeg. We require minimum versions.
123	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],	122	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
Lines 126-132 Link Here
126	[FFMPEG_FOUND="false"])	125	[FFMPEG_FOUND="false"])
127		126
128	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then	127	if test "${USE_STATIC_FFMPEG}" = "1" && test "$FFMPEG_FOUND" = "true"; then
129	@@ -1596,7 +1637,11 @@	128	@@ -1596,7 +1636,11 @@
130	elif test "$with_ffmpeg" = "force"; then	129	elif test "$with_ffmpeg" = "force"; then
131	# always build our ffmpeg	130	# always build our ffmpeg
132	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")	131	AC_MSG_NOTICE("FFmpeg installation forced by user - installing our version")
Lines 139-145 Link Here
139	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"	138	export PKG_CONFIG_PATH="${ffmpeg_build}/ffmpeg-install/lib/pkgconfig:$PKG_CONFIG_PATH"
140		139
141	elif test "$with_ffmpeg" != "no"; then	140	elif test "$with_ffmpeg" != "no"; then
142	@@ -1609,7 +1654,7 @@	141	@@ -1609,7 +1653,7 @@
143		142
144	if test "$FFMPEG_FOUND" != "true"; then	143	if test "$FFMPEG_FOUND" != "true"; then
145	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],	144	PKG_CHECK_MODULES([FFMPEG], [$FFMPEG_LIBNAMES],
Lines 148-154 Link Here
148	[AC_MSG_ERROR("ffmpeg not found")])	147	[AC_MSG_ERROR("ffmpeg not found")])
149	fi	148	fi
150		149
151	@@ -1633,9 +1678,9 @@	150	@@ -1633,9 +1677,9 @@
152	echo "Checking for SWIG installation"	151	echo "Checking for SWIG installation"
153	AC_PATH_PROG(SWIG_EXE, swig, "none")	152	AC_PATH_PROG(SWIG_EXE, swig, "none")
154	if test "$SWIG_EXE" = "none"; then	153	if test "$SWIG_EXE" = "none"; then
Lines 161-167 Link Here
161	fi	160	fi
162	fi	161	fi
163	if test "$SWIG_EXE" = "none"; then	162	if test "$SWIG_EXE" = "none"; then
164	@@ -1928,7 +1973,7 @@	163	@@ -1928,7 +1972,7 @@
165	AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],	164	AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
166	[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])	165	[$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
167	if test "$TEXTUREPACKER" = "none"; then	166	if test "$TEXTUREPACKER" = "none"; then
Lines 170-176 Link Here
170	TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"	169	TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
171	fi	170	fi
172	if test -x "$TEXTUREPACKER"; then	171	if test -x "$TEXTUREPACKER"; then
173	@@ -2148,6 +2193,8 @@	172	@@ -2148,6 +2192,8 @@
174	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"	173	LIBS="$LIBS -L\$(abs_top_srcdir)/lib/ffmpeg/libswscale -lswscale"
175	fi	174	fi
176		175