tizen/distrib/libav/*: Added 64-bit libav

Conflicts:

	tizen/distrib/libav/tizen_configure
	tizen/src/Makefile.tizen

diff --git a/tizen/distrib/libav/lib_x86_64/libavdevice.a b/tizen/distrib/libav/lib_x86_64/libavdevice.a
new file mode 100644 (file)
index 0000000..8d5a7f9
Binary files /dev/null and b/tizen/distrib/libav/lib_x86_64/libavdevice.a differ

diff --git a/tizen/distrib/libav/lib_x86_64/libavfilter.a b/tizen/distrib/libav/lib_x86_64/libavfilter.a
new file mode 100644 (file)
index 0000000..e323445
Binary files /dev/null and b/tizen/distrib/libav/lib_x86_64/libavfilter.a differ

diff --git a/tizen/distrib/libav/lib_x86_64/libavformat.a b/tizen/distrib/libav/lib_x86_64/libavformat.a
new file mode 100644 (file)
index 0000000..0c605f1
Binary files /dev/null and b/tizen/distrib/libav/lib_x86_64/libavformat.a differ

diff --git a/tizen/distrib/libav/lib_x86_64/libavutil.a b/tizen/distrib/libav/lib_x86_64/libavutil.a
new file mode 100644 (file)
index 0000000..7d6bfcd
Binary files /dev/null and b/tizen/distrib/libav/lib_x86_64/libavutil.a differ

diff --git a/tizen/distrib/libav/tizen_configure b/tizen/distrib/libav/tizen_configure
index f76e6c7..dc62c76 100755 (executable)
--- a/tizen/distrib/libav/tizen_configure
+++ b/tizen/distrib/libav/tizen_configure
@@ -10,9 +10,9 @@ fi
 
 case $TARGET_OS in
 Linux*)
-./configure --prefix=./$BIN_DIR --arch=x86 --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
+./configure --extra-cflags="-m32 -I$PWD/include" --extra-ldflags="-m32" --prefix=./$BIN_DIR --arch=x86 --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
 ;;
 MINGW*)
-./configure --prefix=./$BIN_DIR --arch=x86 --enable-shared --disable-static --enable-optimizations --enable-memalign-hack --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
+./configure --extra-cflags="-m32 -I$PWD/include" --extra-ldflags="-m32" --prefix=./$BIN_DIR --arch=x86 --enable-shared --disable-static --enable-optimizations --enable-memalign-hack --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
 ;;
 esac

diff --git a/tizen/distrib/libav/tizen_configure_x86_64 b/tizen/distrib/libav/tizen_configure_x86_64
new file mode 100755 (executable)
index 0000000..a603d89
--- /dev/null
+++ b/tizen/distrib/libav/tizen_configure_x86_64
@@ -0,0 +1,19 @@
+#!/bin/sh
+TARGET_OS=`uname -s`
+
+case $TARGET_OS in
+Linux*)
+rm -rf build_x86_64
+mkdir -p build_x86_64
+cd build_x86_64
+../configure --extra-cflags="-m64 -I$PWD/../include" --extra-ldflags="-m64" --prefix=/ --arch=x86_64 --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=vc1
+make install DESTDIR="$PWD/../install_x86_64"
+;;
+MINGW*)
+rm -rf build_x86_64
+mkdir -p build_x86_64
+cd build_x86_64
+./configure --extra-cflags="-m64 -I$PWD/../include" --extra-ldflags="-m64" --prefix=/ --arch=x86_64 --enable-shared --disable-static --enable-optimizations --enable-memalign-hack --disable-yasm --disable-doc --disable-gpl --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=vc1
+make install DESTDIR="$PWD/../install_x86_64"
+;;
+esac

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index 38276d5..37a2031 100755 (executable)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -7,6 +7,10 @@ $(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/tizen/sr
 QEMU_CFLAGS += -I$(SRC_PATH)/hw -I$(SRC_PATH)/tizen/src
 QEMU_CFLAGS += -I$(SRC_PATH)/tizen/distrib/libav/$(ARCH)/include
 QEMU_CFLAGS += -L$(SRC_PATH)/tizen/distrib/libav/$(ARCH)/lib
+ifeq ($(ARCH), i386)
+else
+QEMU_CFLAGS += -L$(SRC_PATH)/tizen/distrib/libav/lib_x86_64
+endif
 QEMU_CFLAGS += $(SDL_CFLAGS)
 QEMU_CFLAGS += $(GLIB_CFLAGS)
 CFLAGS += -g -O2
@@ -15,9 +19,9 @@ ifdef CONFIG_WIN32
 LIBS += -lavformat -lavcodec -lavutil -lm
 else
 LIBS += -lavformat -lavcodec -lavutil -lm -lGL
-ifeq ($(ARCH),x86_64)
-LIBS += -lva
-endif
+#ifeq ($(ARCH),x86_64)
+#LIBS += -lva
+#endif
 endif
 
 ifdef CONFIG_DEBUG_EXEC
@@ -44,18 +48,18 @@ gl_func.h: parse_gl_h
        ./parse_gl_h 2>/dev/null
 opengl_func.h: gl_func.h
 helper_opengl.o: helper_opengl.c opengl_func.h server_stub.c opengl_process.h
-       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $< 
+       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $<
 gl_beginend.h: $(GL_CUR_PATH)/beginend_funcs.sh
        $< > $@
 mesa_mipmap.o : mesa_mipmap.c
-       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $< 
+       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $<
 opengl_exec.o : opengl_exec.c server_stub.c opengl_func.h gl_beginend.h opengl_process.h mesa_mipmap.o
-       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $< 
+       $(CC) $(GL_CFLAGS) $(DEFINES) $(GL_LDFLAGS) -c -o $@ $<
 
 endif #($(TARGET_ARCH), i386)
 ###########################################################
 endif #CONFIG_WIN32
-       
+
 # maru loader
 obj-y += emulator.o emul_state.o option.o maru_err_table.o