projects / scm / bb / meta-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 831abe6)
Fix new packages
authorRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 16:39:26 +0000 (18:39 +0200)
committerRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 16:40:27 +0000 (18:40 +0200)
Change-Id: I1a4a27b3fd53531acdefa03c9556c82c28b75e07

conf/layer.conf patch | blob | history
recipes-connectivity/bluez/bluez4_4.101.bbappend [deleted file] patch | blob | history
recipes-image/images/tizen-common-core-image-minimal.bb patch | blob | history
recipes-multimedia/libav/libav_9.13.bbappend [new file with mode: 0644] patch | blob
recipes-tizen/download-provider/download-provider-extraconf.inc patch | blob | history
recipes-tizen/libav/libav_git.bb [deleted file] patch | blob | history
recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc patch | blob | history
recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc patch | blob | history
recipes-tizen/libmm-utility/libmm-utility.inc patch | blob | history
recipes-tizen/message-port/message-port_git.bb patch | blob | history

diff --git a/conf/layer.conf b/conf/layer.conf
index 6bf2e8b..4af3329 100644 (file)
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -41,4 +41,6 @@ DISTRO_FEATURES_append = " ld-is-gold "
 
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 
-LICENSE_FLAGS_WHITELIST += "commercial"
\ No newline at end of file
+LICENSE_FLAGS_WHITELIST += "commercial"
+
+PREFERRED_VERSION_libav = "9.13"
\ No newline at end of file
diff --git a/recipes-connectivity/bluez/bluez4_4.101.bbappend b/recipes-connectivity/bluez/bluez4_4.101.bbappend
deleted file mode 100644 (file)
index 6e5cc1e..0000000
--- a/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILES_${PN} += "/usr/lib/udev/hid2hci"
\ No newline at end of file
diff --git a/recipes-image/images/tizen-common-core-image-minimal.bb b/recipes-image/images/tizen-common-core-image-minimal.bb
index 934b9fd..f1e07f6 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-minimal.bb
+++ b/recipes-image/images/tizen-common-core-image-minimal.bb
@@ -24,3 +24,4 @@ IMAGE_INSTALL += "weston-common-config"
 IMAGE_INSTALL += "user-session-units"
 IMAGE_INSTALL += "default-ac-domains"
 IMAGE_INSTALL += "desktop-skin"
+IMAGE_INSTALL += "rpm-security-plugin"
diff --git a/recipes-multimedia/libav/libav_9.13.bbappend b/recipes-multimedia/libav/libav_9.13.bbappend
new file mode 100644 (file)
index 0000000..dedf7cc
--- /dev/null
+++ b/recipes-multimedia/libav/libav_9.13.bbappend
@@ -0,0 +1,3 @@
+do_install_append() {
+ cp ${S}/libavformat/url.h ${D}/usr/include/libavformat
+}
\ No newline at end of file
diff --git a/recipes-tizen/libav/libav_git.bb b/recipes-tizen/libav/libav_git.bb
deleted file mode 100644 (file)
index 57cdac2..0000000
--- a/recipes-tizen/libav/libav_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libav.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/platform/upstream/libav;tag=8e5fcbeb90f32dd1120b12b652095568f60b9575;nobranch=1"
-
-BBCLASSEXTEND += " native "
-
diff --git a/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc b/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
index e69de29..af8b214 100644 (file)
--- a/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
+++ b/recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
@@ -0,0 +1,25 @@
+do_install() {
+ echo export RPM_BUILD_ROOT=${D}
+ cd ${S}
+ LANG=C
+ export LANG
+ 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 --
+   find ${D} -regex ".*\.a$" | xargs rm -f --
+
+
+
+
+}
+
+INSANE_SKIP_${PN} = "dev-so"
\ No newline at end of file
diff --git a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
index a6cae77..1572b45 100644 (file)
--- a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
+++ b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Media Fileinfo"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "Apache License, Version 2.0"
+LICENSE = "Apache License 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/recipes-tizen/libmm-utility/libmm-utility.inc b/recipes-tizen/libmm-utility/libmm-utility.inc
index aba9bf0..b722764 100644 (file)
--- a/recipes-tizen/libmm-utility/libmm-utility.inc
+++ b/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,14 +66,13 @@ 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= \
@@ -91,12 +90,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() {
@@ -107,21 +106,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/recipes-tizen/message-port/message-port_git.bb b/recipes-tizen/message-port/message-port_git.bb
index 8823e1b..81fa947 100644 (file)
--- a/recipes-tizen/message-port/message-port_git.bb
+++ b/recipes-tizen/message-port/message-port_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port;tag=4ee5f77116ba97e8588a7c4c329ee427e9147068;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/message-port;tag=047b8655fc59cb24d8937d132455dd1e521a4d1f;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
Domain: SCM / BB;