Fixed build break on 64bit

Change-Id: I1bd7540831b71251c62032a0f31239ae6a233e20

diff --git a/configure.ac b/configure.ac
index 79a65ff49aad3f9e49c68e09ecf46581eed69d72..4550422be01ab708f9c0540f3c43c0a5f6c0d8ea 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -185,4 +185,15 @@ AC_ARG_ENABLE(drm, AC_HELP_STRING([--enable-use-drm], [use drm]),
         [BOARD_USE_DRM=no])
 AM_CONDITIONAL([BOARD_USE_DRM], [test "x$BOARD_USE_DRM" = "xyes"])
 
+AC_ARG_ENABLE(neon, AC_HELP_STRING([--enable-neon], [neon]),
+        [
+          case "${enableval}" in
+           yes) BOARD_USE_NEON=yes ;;
+           no)  BOARD_USE_NEON=no ;;
+           *)   AC_MSG_ERROR(bad value ${enableval} for --enable-neon) ;;
+          esac
+        ],
+        [BOARD_USE_NEON=no])
+AM_CONDITIONAL([BOARD_USE_NEON], [test "x$BOARD_USE_NEON" = "xyes"])
+
 AC_OUTPUT

diff --git a/exynos4/libswconverter/Makefile.am b/exynos4/libswconverter/Makefile.am
index c3f44e555173dbb5a8eb57fca14f5ee3787de30b..a2fab4570f1f4a64b5585993665e6775c5143c19 100755 (executable)
--- a/exynos4/libswconverter/Makefile.am
+++ b/exynos4/libswconverter/Makefile.am
@@ -1,16 +1,18 @@
 lib_LTLIBRARIES = libswconverter.la
 
-libswconverter_la_SOURCES = swconvertor.c \
-                            csc_ARGB8888_to_YUV420SP_NEON.s \
-                            csc_interleave_memcpy_neon.s \
-                            csc_linear_to_tiled_crop_neon.s \
-                            csc_linear_to_tiled_interleave_crop_neon.s \
-                            csc_tiled_to_linear_crop_neon.s \
-                            csc_tiled_to_linear_deinterleave_crop_neon.s
-
+libswconverter_la_SOURCES = swconvertor.c
 
 libswconverter_la_LIBADD =
 libswconverter_la_CFLAGS = -I$(top_srcdir)/exynos4/include \
                            -I$(top_srcdir)/exynos/include
 
+if BOARD_USE_NEON
+libswconverter_la_SOURCES += csc_ARGB8888_to_YUV420SP_NEON.s \
+                            csc_interleave_memcpy_neon.s \
+                            csc_linear_to_tiled_crop_neon.s \
+                            csc_linear_to_tiled_interleave_crop_neon.s \
+                            csc_tiled_to_linear_crop_neon.s \
+                            csc_tiled_to_linear_deinterleave_crop_neon.s
 
+libswconverter_la_CFLAGS += -DUSE_NEON
+endif

diff --git a/omxil-e54xx.pc.in b/omxil-e54xx.pc.in
index faf96b84c24034417de69d6c7ee7153c78644546..1c7efb4fdc77a51eb192419b1f8c488880fec273 100755 (executable)
--- a/omxil-e54xx.pc.in
+++ b/omxil-e54xx.pc.in
@@ -1,6 +1,7 @@
 prefix=@prefix@
-libdir=@prefix@/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=@prefix@/include
+omxdir=@libdir@
 
 Name: Samsung OpenMAX IL package
 Description: Samsung E4X12 codec

diff --git a/openmax/component/audio/dec/mp3/Makefile.am b/openmax/component/audio/dec/mp3/Makefile.am
index eaff5519c9cdebb0f378488742915f6a31042159..23453a43736490cb3366b505335d24b1780d6644 100755 (executable)
--- a/openmax/component/audio/dec/mp3/Makefile.am
+++ b/openmax/component/audio/dec/mp3/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.MP3.Decoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_MP3_Decoder_la_SOURCES = Exynos_OMX_Mp3dec.c \
                                     Exynos_OMX_Mp3dec.h \

diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h
index 9b039f21e32ceff4adffbbf17254a4c9b0ca353e..7f36d71f99ceee635837a66e257ca2db309965b3 100755 (executable)
--- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h
+++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h
@@ -74,6 +74,9 @@ extern "C" {
 OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent, OMX_STRING componentName);
 OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent);
 
+OMX_ERRORTYPE H264CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent);
+OMX_ERRORTYPE H264CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent);
+
 #ifdef __cplusplus
 };
 #endif

diff --git a/openmax/component/video/dec/h264/Makefile.am b/openmax/component/video/dec/h264/Makefile.am
index 538ecb2be52c0daddbc482b19938ae27f6c5c7f6..1b27150b2a799d4d9387bf7c29e76c2118af90b9 100755 (executable)
--- a/openmax/component/video/dec/h264/Makefile.am
+++ b/openmax/component/video/dec/h264/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Decoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_AVC_Decoder_la_SOURCES = Exynos_OMX_H264dec.c \
                                        Exynos_OMX_H264dec.h \

diff --git a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h
index 74307541d92b3d258ed34ae94239171fca4e0cbb..c9b4b9ae38dd0a987023b7aeb1a7c3b7fac7e1c1 100755 (executable)
--- a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h
+++ b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h
@@ -75,6 +75,8 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
 OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(
     OMX_HANDLETYPE hComponent);
 
+OMX_ERRORTYPE Mpeg2CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent);
+OMX_ERRORTYPE Mpeg2CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent);
 #ifdef __cplusplus
 };
 #endif

diff --git a/openmax/component/video/dec/mpeg2/Makefile.am b/openmax/component/video/dec/mpeg2/Makefile.am
index 14b59b747a1ba1d174acbc93567f3d4c31d7f7f5..1316b11baaad97a42e12e72687ae966c3e10ff4a 100755 (executable)
--- a/openmax/component/video/dec/mpeg2/Makefile.am
+++ b/openmax/component/video/dec/mpeg2/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.M2V.Decoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_M2V_Decoder_la_SOURCES = Exynos_OMX_Mpeg2dec.c \
                                     Exynos_OMX_Mpeg2dec.h \

diff --git a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
index a1b0706dd4c4707d9dfb87d46048170320d07378..3740733ac3a9dd216108dc1f0e79ae6cb189f3f0 100755 (executable)
--- a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
+++ b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h
@@ -107,6 +107,8 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
 OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(
     OMX_HANDLETYPE hComponent);
 
+OMX_ERRORTYPE Mpeg4CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent);
+OMX_ERRORTYPE Mpeg4CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent);
 #ifdef __cplusplus
 };
 #endif

diff --git a/openmax/component/video/dec/mpeg4/Makefile.am b/openmax/component/video/dec/mpeg4/Makefile.am
index 4eeee838a873b29631edb9b69afbeadab95f18df..de95dffa5830dc745f907c8cc19256465ca327ed 100755 (executable)
--- a/openmax/component/video/dec/mpeg4/Makefile.am
+++ b/openmax/component/video/dec/mpeg4/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.M4V.Decoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_M4V_Decoder_la_SOURCES = Exynos_OMX_Mpeg4dec.c \
                                     Exynos_OMX_Mpeg4dec.h \

diff --git a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h
index d944208d5fe0a452a0ec932531fe244071f49476..f614c833b7b3c3053b2cb2c6755fd5eb6a9f7f23 100755 (executable)
--- a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h
+++ b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h
@@ -112,6 +112,9 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(
 OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(
     OMX_HANDLETYPE hComponent);
 
+OMX_ERRORTYPE WmvCodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent);
+OMX_ERRORTYPE WmvCodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent);
+OMX_ERRORTYPE WmvCodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent);
 #ifdef __cplusplus
 };
 #endif

diff --git a/openmax/component/video/dec/vc1/Makefile.am b/openmax/component/video/dec/vc1/Makefile.am
index d3636bc2bcde3cb24ee9ec614c7424e0f865d431..abb2fb59bde816e49dc5a8607d3718d8094e85fe 100755 (executable)
--- a/openmax/component/video/dec/vc1/Makefile.am
+++ b/openmax/component/video/dec/vc1/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.WMV.Decoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_WMV_Decoder_la_SOURCES = Exynos_OMX_Wmvdec.c \
                                     Exynos_OMX_Wmvdec.h \

diff --git a/openmax/component/video/enc/h264/Makefile.am b/openmax/component/video/enc/h264/Makefile.am
index a59e5ff9c2b2f92deee1b1e8e31b7421f46b046f..494c384db61b3fd5657b0b4487d0e04c20af9f5c 100755 (executable)
--- a/openmax/component/video/enc/h264/Makefile.am
+++ b/openmax/component/video/enc/h264/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.AVC.Encoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_AVC_Encoder_la_SOURCES = Exynos_OMX_H264enc.c \
                                     Exynos_OMX_H264enc.h \

diff --git a/openmax/component/video/enc/mpeg4/Makefile.am b/openmax/component/video/enc/mpeg4/Makefile.am
index dda1a4f5403cdeca5ab73d66f8f1fb19bf3f7ca9..9e461257e8b677473a110251b9703e1ff326d7a7 100755 (executable)
--- a/openmax/component/video/enc/mpeg4/Makefile.am
+++ b/openmax/component/video/enc/mpeg4/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libOMX.Exynos.M4V.Encoder.la
-libdir = @prefix@/lib/omx
+libdir = @libdir@/omx
 
 libOMX_Exynos_M4V_Encoder_la_SOURCES = Exynos_OMX_Mpeg4enc.c \
                                     Exynos_OMX_Mpeg4enc.h \

diff --git a/packaging/libomxil-e54xx.spec b/packaging/libomxil-e54xx.spec
index b31db7ddc85566684b93b4ac418b39d74576ddcb..1cb5344ff50ad932f9786994d1b785444a1c47e1 100755 (executable)
--- a/packaging/libomxil-e54xx.spec
+++ b/packaging/libomxil-e54xx.spec
@@ -28,7 +28,10 @@ development package for libomxil-e54xx-v4l2
 %build
 ./autogen.sh
 
-export CFLAGS+=" -mfpu=neon\
+export CFLAGS+="\
+%ifnarch aarch64
+ -mfpu=neon\
+%endif
  -DUSE_PB\
  -DUSE_DMA_BUF\
  -DUSE_H264_PREPEND_SPS_PPS\
@@ -36,7 +39,11 @@ export CFLAGS+=" -mfpu=neon\
  -DKERNEL_HEADER_MODIFICATION"
 
 
-%configure --prefix=%{_prefix} --disable-static --enable-dlog
+%ifnarch aarch64
+%configure --prefix=%{_prefix} --disable-static --enable-dlog --enable-neon
+%else
+%configure --prefix=%{_prefix} --disable-static --enable-dlog --disable-neon
+%endif
 
 #make %{?jobs:-j%jobs}
 make
@@ -54,11 +61,11 @@ rm -rf %{buildroot}
 
 %files
 %manifest libomxil-e54xx.manifest
-/usr/lib/*.so*
-/usr/lib/omx/*.so
+%{_libdir}/*.so*
+%{_libdir}/omx/*.so
 
 
 %files devel
 /usr/include/*
-/usr/lib/pkgconfig/*
+%{_libdir}/pkgconfig/*
 

diff --git a/srp.pc.in b/srp.pc.in
index 2dc20c37fa179ffc7b88960496a247813c5eea94..d7cc67a57600f00ad061844174218a5ffad5f5cc 100755 (executable)
--- a/srp.pc.in
+++ b/srp.pc.in
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=@prefix@/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=@prefix@/include
 
 Name: Samsung RP package