From: Sooyoung Ha <yoosah.ha@samsung.com>
Date: Thu, 26 Feb 2015 15:21:47 +0000 (+0900)
Subject: brillcodec: disable the h.264 encoder
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~111
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f360c5a63db017264d2725527cc42be4459fd8b;p=sdk%2Femulator%2Fqemu.git

brillcodec: disable the h.264 encoder

modify configure and disable the h.264 encoder for release

Change-Id: I4626fcf538ef3ae9842f26c82dc2ff9970b429f7
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---

diff --git a/configure b/configure
index fe732e5b34..20925efd72 100755
--- a/configure
+++ b/configure
@@ -3988,11 +3988,11 @@ if test "$libav" != "no"; then
     libavformat_version="54.20.3"
     libavresample_package="libavresample"
     libavresample_version="1.0.1"
-    libx264_package="x264"
 
     if $pkg_config --exists "$libavcodec_package >= $libavcodec_version" ; then
         libav_cflags=`$pkg_config --cflags $libavcodec_package`
         libav_libs=`$pkg_config --libs $libavcodec_package`
+        libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
         #if test "$libav" = "yes" ; then
@@ -4002,7 +4002,8 @@ if test "$libav" != "no"; then
     fi
 
     if $pkg_config --exists "$libavutil_package >= $libavutil_version" ; then
-        libav_libs="$libav_libs `$pkg_config --libs-only-l $libavutil_package`"
+        libav_libs=`$pkg_config --libs-only-l $libavutil_package`
+        libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
         #if test "$libav" = "yes" ; then
@@ -4012,7 +4013,8 @@ if test "$libav" != "no"; then
     fi
 
     if $pkg_config --exists "$libavformat_package >= $libavformat_version" ; then
-        libav_libs="$libav_libs `$pkg_config --libs-only-l $libavformat_package`"
+        libav_libs=`$pkg_config --libs-only-l $libavformat_package`
+        libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
         #if test "$libav" = "yes" ; then
@@ -4022,7 +4024,8 @@ if test "$libav" != "no"; then
     fi
 
     if $pkg_config --exists "$libavresample_package >= $libavresample_version" ; then
-        libav_libs="$libav_libs `$pkg_config --libs-only-l $libavresample_package`"
+        libav_libs=`$pkg_config --libs-only-l $libavresample_package`
+        libs_softmmu="$libav_libs $libs_softmmu"
         libav="yes"
     else
         #if test "$libav" = "yes" ; then
@@ -4031,15 +4034,6 @@ if test "$libav" != "no"; then
         libav="no"
     fi
 
-    if $pkg_config --exists "$libx264_package" ; then
-        libav_libs="$libav_libs `$pkg_config --libs $libx264_package`"
-        libav="yes"
-    else
-        #if test "$libav" = "yes" ; then
-        #    feature_not_found "libav"
-        #fi
-        libav="no"
-    fi
 fi
 
 ##########################################
@@ -4849,7 +4843,6 @@ fi
 if test "$libav" = "yes" ; then
   echo "CONFIG_LIBAV=y" >> $config_host_mak
   echo "LIBAV_CFLAGS=$libav_cflags" >> $config_host_mak
-  echo "LIBAV_LIBS=$libav_libs" >> $config_host_mak
 fi
 if test "$libpng" = "yes" ; then
   echo "CONFIG_PNG=y" >> $config_host_mak
diff --git a/package/build.macos-64 b/package/build.macos-64
index 075a212e73..08d745495f 100755
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -25,7 +25,7 @@ prepare()
         exit 1
     fi
 
-    export PKG_CONFIG_PATH=$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libidn/lib/pkgconfig:$ROOTDIR/libxml2/lib/pkgconfig:$ROOTDIR/ncurses/lib/pkgconfig:$ROOTDIR/openssl/lib/pkgconfig:$ROOTDIR/pixman/lib/pkgconfig:$ROOTDIR/zlib/lib/pkgconfig:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/libpng/lib/pkgconfig:$ROOTDIR/x264/lib/pkgconfig:$PKG_CONFIG_PATH
+    export PKG_CONFIG_PATH=$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libidn/lib/pkgconfig:$ROOTDIR/libxml2/lib/pkgconfig:$ROOTDIR/ncurses/lib/pkgconfig:$ROOTDIR/openssl/lib/pkgconfig:$ROOTDIR/pixman/lib/pkgconfig:$ROOTDIR/zlib/lib/pkgconfig:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/libpng/lib/pkgconfig:$PKG_CONFIG_PATH
 
     BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/libiconv/include "
     BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/libiconv/lib "
@@ -107,11 +107,13 @@ build()
 install()
 {
     X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
+#   ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools
     COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
     MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3/emulator-resources/skins
     WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3/emulator-resources/skins
 
     mkdir -p $X86_BIN_DIR
+#   mkdir -p $ARM_BIN_DIR
     mkdir -p $COMMON_BIN_DIR
     mkdir -p $MOBILE_2_3_SKIN_RESOURCE_DIR
     mkdir -p $WEARABLE_2_3_SKIN_RESOURCE_DIR
@@ -120,6 +122,7 @@ install()
     make install_dibs
 
     mv x86 $X86_BIN_DIR/emulator
+#   mv x86 $ARM_BIN_DIR/emulator
     mv common $COMMON_BIN_DIR/emulator
 
     #profile skins
diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 66799d4488..f35ef73263 100755
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -4,7 +4,7 @@ clean()
 {
 	prepare
 
-	export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${ROOTDIR}/libav/lib/pkgconfig
 
 	cd $SRCDIR/tizen
 	if test -e "Makefile"
@@ -48,7 +48,7 @@ prepare()
 # build
 build()
 {
-	export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig
 
 	cd $SRCDIR/tizen/
 	./emulator_configure.sh x86
@@ -60,17 +60,33 @@ build()
 		echo "x86 build failure"
 		exit 1
 	fi
+
+#	make install_dibs
+#	make clean
+#
+#	./emulator_configure.sh arm
+#	make all_dibs
+#	if [ $? -eq 0 ]
+#	then
+#		echo "arm build success"
+#	else
+#		echo "arm build failure"
+#		exit 1
+#	fi
+#	make install_dibs
 }
 
 # install
 install()
 {
 	X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
+#	ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools
 	COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
 	MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3/emulator-resources/skins
 	WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3/emulator-resources/skins
 
 	mkdir -p $X86_BIN_DIR
+#	mkdir -p $ARM_BIN_DIR
 	mkdir -p $COMMON_BIN_DIR
 	mkdir -p $MOBILE_2_3_SKIN_RESOURCE_DIR
 	mkdir -p $WEARABLE_2_3_SKIN_RESOURCE_DIR
@@ -79,6 +95,7 @@ install()
 	make install_dibs
 
 	mv x86 $X86_BIN_DIR/emulator
+#	mv x86 $ARM_BIN_DIR/emulator
 	mv common $COMMON_BIN_DIR/emulator
 
 	#profile skins
diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index 66799d4488..f35ef73263 100755
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -4,7 +4,7 @@ clean()
 {
 	prepare
 
-	export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${ROOTDIR}/libav/lib/pkgconfig
 
 	cd $SRCDIR/tizen
 	if test -e "Makefile"
@@ -48,7 +48,7 @@ prepare()
 # build
 build()
 {
-	export PKG_CONFIG_PATH=${ROOTDIR}/x264/lib/pkgconfig:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig:${PKG_CONFIG_PATH}
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${ROOTDIR}/remote/lib/pkgconfig:${ROOTDIR}/libav/lib/pkgconfig
 
 	cd $SRCDIR/tizen/
 	./emulator_configure.sh x86
@@ -60,17 +60,33 @@ build()
 		echo "x86 build failure"
 		exit 1
 	fi
+
+#	make install_dibs
+#	make clean
+#
+#	./emulator_configure.sh arm
+#	make all_dibs
+#	if [ $? -eq 0 ]
+#	then
+#		echo "arm build success"
+#	else
+#		echo "arm build failure"
+#		exit 1
+#	fi
+#	make install_dibs
 }
 
 # install
 install()
 {
 	X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
+#	ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools
 	COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
 	MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3/emulator-resources/skins
 	WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3/emulator-resources/skins
 
 	mkdir -p $X86_BIN_DIR
+#	mkdir -p $ARM_BIN_DIR
 	mkdir -p $COMMON_BIN_DIR
 	mkdir -p $MOBILE_2_3_SKIN_RESOURCE_DIR
 	mkdir -p $WEARABLE_2_3_SKIN_RESOURCE_DIR
@@ -79,6 +95,7 @@ install()
 	make install_dibs
 
 	mv x86 $X86_BIN_DIR/emulator
+#	mv x86 $ARM_BIN_DIR/emulator
 	mv common $COMMON_BIN_DIR/emulator
 
 	#profile skins
diff --git a/package/build.windows-32 b/package/build.windows-32
index dc8345f36c..7be0dadf02 100755
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -39,9 +39,9 @@ prepare()
 
 	if [ -z ${PKG_CONFIG_PATH} ]
 	then
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig
+		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig
 	else
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig:${PKG_CONFIG_PATH}
+		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:${PKG_CONFIG_PATH}
 	fi
 	export PKG_CONFIG_PATH
 
diff --git a/tizen/src/hw/pci/Makefile.objs b/tizen/src/hw/pci/Makefile.objs
index 86c0c26cef..f816976dd8 100644
--- a/tizen/src/hw/pci/Makefile.objs
+++ b/tizen/src/hw/pci/Makefile.objs
@@ -21,6 +21,4 @@ LIBS += -framework AppKit
 endif
 
 maru_brillcodec_device.o-cflags := $(LIBAV_CFLAGS)
-maru_brillcodec_device.o-libs := $(LIBAV_LIBS)
 maru_brillcodec.o-cflags := $(LIBAV_CFLAGS)
-maru_brillcodec.o-libs := $(LIBAV_LIBS)