meta-tizen: Fix new packages

Change-Id: I42cc4f0557607c1f8b1bca3019fdff021b3b2190
(From meta-tizen rev: d41ab4608aaa364805c6e0904bbc59863821b82a)

diff --git a/meta-tizen/recipes-connectivity/bluez5/bluez5_5.19.bbappend b/meta-tizen/recipes-connectivity/bluez5/bluez5_5.19.bbappend
deleted file mode 100644 (file)
index 3e34b84..0000000
--- a/meta-tizen/recipes-connectivity/bluez5/bluez5_5.19.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-do_install_append() {
- rm -fr ${D}/usr/lib/udev/hid2hci
-}
\ No newline at end of file

diff --git a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
index 7027c83..7c44ee3 100644 (file)
--- a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
@@ -1,3 +1,6 @@
+SRC_URI += "file://Makefile.am.diff"
+
+
 do_install() {
  echo export RPM_BUILD_ROOT=${D}
  cd ${S}

diff --git a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
index 1572b45..a6cae77 100644 (file)
--- a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
+++ b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Media Fileinfo"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "Apache License 2.0"
+LICENSE = "Apache License, Version 2.0"
 
 SRC_URI = ""
 
@@ -35,8 +35,8 @@ do_prep() {
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/libmm-fileinfo.manifest .
-
-
+ 
+ 
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -54,15 +54,15 @@ do_compile() {
  CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
  FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-
+ 
  CFLAGS="${CFLAGS} -D_MM_PROJECT_FLOATER -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
  export CFLAGS
-
-
-
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
+ 
+ 
+   
+   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
+   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
+   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -79,11 +79,11 @@ do_compile() {
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
          --infodir=${infodir}.sh
-
-
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
+ 
+ 
+   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
+   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
+   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -99,12 +99,12 @@ do_compile() {
          --localstatedir=${localstatedir} \
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
-         --infodir=${infodir} --disable-testmode --disable-dump --enable-dyn --disable-iommap  --disable-drm --disable-gtk
-
+         --infodir=${infodir} --disable-testmode --disable-dump --enable-dyn --disable-iommap  --disable-drm --disable-gtk         
+ 
  make
-
-
-
+ 
+ 
+ 
 }
 
 do_install() {
@@ -115,21 +115,21 @@ do_install() {
  unset DISPLAY
  rm -rf ${D}
  mkdir -p ${D}
-
-
+ 
+ 
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-   install
-   rm -f ${D}${infodir}/dir
-   find ${D} -regex ".*\.la$" | xargs rm -f --
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}/${prefix}/share/license
  cp -rf ${WORKDIR}/libmm-fileinfo-0.6.0/LICENSE.APLv2.0 ${D}/${prefix}/share/license/libmm-fileinfo
-
-
-
+ 
+ 
+ 
 }
 
 pkg_postinst_${PN}() {

diff --git a/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo/Makefile.am.diff b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo/Makefile.am.diff
new file mode 100644 (file)
index 0000000..0185a36
--- /dev/null
+++ b/meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo/Makefile.am.diff
@@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index 68052bb..46d9b27 100755
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,8 +3,7 @@ ACLOCAL_AMFLAGS=-I m4
+ SUBDIRS = utils \
+         codecs \
+         formats \
+-        . \
+-        tests 
++        . 
+ 
+ lib_LTLIBRARIES = libmmffile.la
+ 

diff --git a/meta-tizen/recipes-tizen/libmm-utility/libmm-utility.inc b/meta-tizen/recipes-tizen/libmm-utility/libmm-utility.inc
index b722764..aba9bf0 100644 (file)
--- a/meta-tizen/recipes-tizen/libmm-utility/libmm-utility.inc
+++ b/meta-tizen/recipes-tizen/libmm-utility/libmm-utility.inc
@@ -46,8 +46,8 @@ do_prep() {
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/libmm-utility.manifest .
-
-
+ 
+ 
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -66,13 +66,14 @@ do_compile() {
  FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
-
+ ./autogen.sh
+ 
  CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
  LDFLAGS+="-Wl,--rpath=${prefix}/lib -Wl,--hash-style=both -Wl,--as-needed" \
-
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
+ 
+   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
+   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
+   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -90,12 +91,12 @@ do_compile() {
          --mandir=${mandir} \
          --infodir=${infodir}
  make -j16
-
+ 
  sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc
  sed -i -e "s#@JPEG_REQPKG@#$JPEG_REQPKG#g" jpeg/mmutil-jpeg.pc
-
-
-
+ 
+ 
+ 
 }
 
 do_install() {
@@ -106,21 +107,21 @@ do_install() {
  unset DISPLAY
  rm -rf ${D}
  mkdir -p ${D}
-
+ 
  rm -rf ${D}
-
+ 
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-   install
-   rm -f ${D}${infodir}/dir
-   find ${D} -regex ".*\.la$" | xargs rm -f --
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}/usr/share/license
  cp LICENSE ${D}/usr/share/license/libmm-utility
-
-
+ 
+ 
 }
 
 pkg_postinst_${PN}() {

diff --git a/meta-tizen/recipes-tizen/media-server/files/Makefile.am.diff b/meta-tizen/recipes-tizen/media-server/files/Makefile.am.diff
new file mode 100644 (file)
index 0000000..445295b
--- /dev/null
+++ b/meta-tizen/recipes-tizen/media-server/files/Makefile.am.diff
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index d068e30..5c83b0b 100755
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = .
+ 
+ AM_CPPFLAGS = $(FMS_DEBUG_FLAGS)
+-
++AUTOMAKE_OPTIONS = subdir-objects
+ AM_LDFLAGS=-Wl,--as-needed -Wl,--hash-style=both
+ 
+ ### pkgconfig ###

diff --git a/meta-tizen/recipes-tizen/media-server/media-server-extraconf.inc b/meta-tizen/recipes-tizen/media-server/media-server-extraconf.inc
index e69de29..6c49508 100644 (file)
--- a/meta-tizen/recipes-tizen/media-server/media-server-extraconf.inc
+++ b/meta-tizen/recipes-tizen/media-server/media-server-extraconf.inc
@@ -0,0 +1 @@
+SRC_URI += "file://Makefile.am.diff"
\ No newline at end of file

diff --git a/meta-tizen/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc b/meta-tizen/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
index 00160b2..53fc98a 100644 (file)
--- a/meta-tizen/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
+++ b/meta-tizen/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
@@ -68,7 +68,7 @@ DEPENDS += "vconf"
 DEPENDS += "url-download"
 DEPENDS += "dbus"
 DEPENDS += "libtapi-legacy"
-DEPENDS += "bluez5"
+DEPENDS += "bluez4"
 DEPENDS += "connection"
 DEPENDS += "notification"
 DEPENDS += "libslp-pm"