From e1018f6f5f896fb283aed26cbbef2246fd9e3a64 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 9 Oct 2014 17:42:19 +0200 Subject: [PATCH] meta-tizen: update recipes Change-Id: If663376e2fc912c78b714b704bba1d383d871f87 (From meta-tizen rev: a366fde255ad0a27e19918f5cb9f3efeabe14bf0) Signed-off-by: Patrick Ohly --- meta-tizen/conf/layer.conf | 2 - meta-tizen/recipes-graphics/mesa/mesa_%.bbappend | 17 +- .../images/tizen-core-image-minimal.bb | 1 - meta-tizen/recipes-tizen/bundle/bundle.inc | 5 +- meta-tizen/recipes-tizen/bundle/bundle_git.bb | 2 +- .../crosswalk/crosswalk-extraconf.inc | 76 -------- meta-tizen/recipes-tizen/crosswalk/crosswalk.inc | 16 +- .../recipes-tizen/crosswalk/crosswalk_git.bb | 2 +- .../genivi-shell/genivi-shell-extraconf.inc | 6 +- meta-tizen/recipes-tizen/hwdata/hwdata.inc | 2 +- .../ico-uxf-homescreen-sample-apps-extraconf.inc | 4 +- .../recipes-tizen/libdrm/libdrm-extraconf.inc | 3 + meta-tizen/recipes-tizen/libdrm/libdrm.inc | 208 +++++++++++++++++++++ meta-tizen/recipes-tizen/libdrm/libdrm_git.bb | 10 + .../libjpeg-turbo/libjpeg-turbo-extraconf.inc | 0 .../recipes-tizen/libjpeg-turbo/libjpeg-turbo.inc | 176 +++++++++++++++++ .../libjpeg-turbo/libjpeg-turbo_git.bb | 10 + .../recipes-tizen/libxml2/files/ansidecl.patch | 25 +++ .../recipes-tizen/libxml2/files/libxml-64bit.patch | 22 +++ .../libxml2/files/libxml2-CVE-2014-0191-fix.patch | 37 ++++ .../libxml2/files/python-sitepackages-dir.patch | 21 +++ meta-tizen/recipes-tizen/libxml2/files/run-ptest | 3 + .../recipes-tizen/libxml2/libxml2-extraconf.inc | 72 +++++++ meta-tizen/recipes-tizen/libxml2/libxml2.inc | 156 ++++++++++++++++ meta-tizen/recipes-tizen/libxml2/libxml2_git.bb | 10 + .../recipes-tizen/meta-generic/meta-generic_git.bb | 2 +- .../python-libxml2/python-libxml2-extraconf.inc | 0 .../python-libxml2/python-libxml2.inc | 103 ++++++++++ .../python-libxml2/python-libxml2_git.bb | 10 + .../python-setuptools-extraconf.inc | 5 + .../python-setuptools/python-setuptools.inc | 6 +- meta-tizen/recipes-tizen/tiff/tiff-extraconf.inc | 0 meta-tizen/recipes-tizen/tiff/tiff.inc | 158 ++++++++++++++++ meta-tizen/recipes-tizen/tiff/tiff_git.bb | 10 + .../recipes-tizen/wrt-widgets/wrt-widgets_git.bb | 2 +- 35 files changed, 1081 insertions(+), 101 deletions(-) create mode 100644 meta-tizen/recipes-tizen/libdrm/libdrm-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/libdrm/libdrm.inc create mode 100644 meta-tizen/recipes-tizen/libdrm/libdrm_git.bb create mode 100644 meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo.inc create mode 100644 meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo_git.bb create mode 100644 meta-tizen/recipes-tizen/libxml2/files/ansidecl.patch create mode 100644 meta-tizen/recipes-tizen/libxml2/files/libxml-64bit.patch create mode 100644 meta-tizen/recipes-tizen/libxml2/files/libxml2-CVE-2014-0191-fix.patch create mode 100644 meta-tizen/recipes-tizen/libxml2/files/python-sitepackages-dir.patch create mode 100644 meta-tizen/recipes-tizen/libxml2/files/run-ptest create mode 100644 meta-tizen/recipes-tizen/libxml2/libxml2-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/libxml2/libxml2.inc create mode 100644 meta-tizen/recipes-tizen/libxml2/libxml2_git.bb create mode 100644 meta-tizen/recipes-tizen/python-libxml2/python-libxml2-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/python-libxml2/python-libxml2.inc create mode 100644 meta-tizen/recipes-tizen/python-libxml2/python-libxml2_git.bb create mode 100644 meta-tizen/recipes-tizen/tiff/tiff-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/tiff/tiff.inc create mode 100644 meta-tizen/recipes-tizen/tiff/tiff_git.bb diff --git a/meta-tizen/conf/layer.conf b/meta-tizen/conf/layer.conf index 0359a80..88fdf4a 100644 --- a/meta-tizen/conf/layer.conf +++ b/meta-tizen/conf/layer.conf @@ -48,8 +48,6 @@ DISTRO_FEATURES_append = " ld-is-gold " PREFERRED_PROVIDER_python-dbus = "dbus-python" -PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" - LICENSE_FLAGS_WHITELIST += "commercial" PREFERRED_VERSION_libav = "9.13" diff --git a/meta-tizen/recipes-graphics/mesa/mesa_%.bbappend b/meta-tizen/recipes-graphics/mesa/mesa_%.bbappend index 93096f7..3b5c0f6 100644 --- a/meta-tizen/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-tizen/recipes-graphics/mesa/mesa_%.bbappend @@ -3,4 +3,19 @@ PACKAGECONFIG_append = " gallium-egl" PACKAGECONFIG_append = " gallium-gbm" PACKAGECONFIG_append = " gallium-llvm" -GALLIUMDRIVERS_append = ",i915" \ No newline at end of file +DRIDRIVERSTIZEN = "swrast" +DRIDRIVERSTIZEN_append_x86 = ",i965,i915" +DRIDRIVERSTIZEN_append_x86-64 = ",i965,i915" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERSTIZEN}, --disable-dri, dri2proto libdrm" + + +GALLIUMDRIVERSTIZEN_append = ",i915" + +GALLIUMDRIVERSTIZEN = "swrast" +GALLIUMDRIVERSTIZEN_LLVM33 = "" +GALLIUMDRIVERSTIZEN_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERSTIZEN_LLVM33}') > 0, d)}" +GALLIUMDRIVERSTIZEN_LLVM = "svga," +GALLIUMDRIVERSTIZEN_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERSTIZEN_LLVM}', '', d)}" +GALLIUMDRIVERSTIZEN_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERSTIZEN_LLVM}', '', d)}" +# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers +PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERSTIZEN}, --without-gallium-drivers" \ No newline at end of file diff --git a/meta-tizen/recipes-image/images/tizen-core-image-minimal.bb b/meta-tizen/recipes-image/images/tizen-core-image-minimal.bb index 64aaa58..75e97ec 100644 --- a/meta-tizen/recipes-image/images/tizen-core-image-minimal.bb +++ b/meta-tizen/recipes-image/images/tizen-core-image-minimal.bb @@ -25,7 +25,6 @@ CORE_IMAGE_BASE_INSTALL += "libegl-gallium" CORE_IMAGE_BASE_INSTALL += "libegl-mesa" CORE_IMAGE_BASE_INSTALL += "libgbm" CORE_IMAGE_BASE_INSTALL += "libgbm-gallium" -CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-nouveau" CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-swrast" CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-vmwgfx" CORE_IMAGE_BASE_INSTALL += "mesa-driver-pipe-i915" diff --git a/meta-tizen/recipes-tizen/bundle/bundle.inc b/meta-tizen/recipes-tizen/bundle/bundle.inc index facba95..d89156a 100644 --- a/meta-tizen/recipes-tizen/bundle/bundle.inc +++ b/meta-tizen/recipes-tizen/bundle/bundle.inc @@ -1,7 +1,7 @@ DESCRIPTION = "String key-val dictionary ADT" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Libraries" -LICENSE = "Apache License, Version 2.0" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -37,7 +37,6 @@ do_prep() { cp ${S}/packaging/bundle.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -66,7 +65,7 @@ do_compile() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . - make -j16 + oe_runmake -j16 diff --git a/meta-tizen/recipes-tizen/bundle/bundle_git.bb b/meta-tizen/recipes-tizen/bundle/bundle_git.bb index 173475d..2f81387 100644 --- a/meta-tizen/recipes-tizen/bundle/bundle_git.bb +++ b/meta-tizen/recipes-tizen/bundle/bundle_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/base/bundle;tag=71b36b170c377bfd15cb5601c49340ba95a1a30d;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/base/bundle;tag=e36cdeba173a93b72110b536094220e1a00c566c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk-extraconf.inc b/meta-tizen/recipes-tizen/crosswalk/crosswalk-extraconf.inc index 4148a65..be46667 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk-extraconf.inc +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk-extraconf.inc @@ -35,82 +35,6 @@ do_compile_prepend() { do_configure() { } -do_compile() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in - # src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's - # CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246 - export CFLAGS=`echo $CFLAGS | sed s,-fno-omit-frame-pointer,,g` - - - # Building the RPM in the GBS chroot fails with errors such as - # /usr/lib/gcc/i586-tizen-linux/4.7/../../../../i586-tizen-linux/bin/ld: - # failed to set dynamic section sizes: Memory exhausted - # For now, work around it by passing a GNU ld-specific flag that optimizes the - # linker for memory usage. - export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" - - # Support building in a non-standard directory, possibly outside ${WORKDIR}. - # Since the build root is erased every time a new build is performed, one way - # to avoid losing the build directory is to specify a location outside the - # build root to the BUILDDIR_NAME definition, such as "/var/tmp/xwalk-build" - # (remember all paths are still inside the chroot): - # gbs build --define 'BUILDDIR_NAME /some/path' - BUILDDIR_NAME="" - if [ -n "${BUILDDIR_NAME}" ]; then - mkdir -p "${BUILDDIR_NAME}" - ln -s "${BUILDDIR_NAME}" src/out - fi - - GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1" - - # Force gold binary from chroot ld.gold provided by binutils-gold - GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1 -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 " - - # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379. - GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1" - - # For building for arm in OBS, we need : - # -> to unset sysroot value. - # sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project - # sysroot usage is not needed, we need to use arm libraries from the virtualized environment. - # - # Crosswalk build fails if the fpu selected in the gcc option is different from neon in case of arm7 compilation - # So force it. - - - # --no-parallel is added because chroot does not mount a /dev/shm, this will - # cause python multiprocessing.SemLock error. - export GYP_GENERATORS='ninja' - ./src/xwalk/gyp_xwalk src/xwalk/xwalk.gyp \ - --no-parallel \ - ${GYP_EXTRA_FLAGS} \ - -Dchromeos=0 \ - -Dclang=0 \ - -Dtizen=1 \ - -Dpython_ver=2.7 \ - -Duse_aura=1 \ - -Duse_cups=0 \ - -Duse_gconf=0 \ - -Duse_gnome_keyring=0 \ - -Duse_kerberos=0 \ - -Duse_system_bzip2=1 \ - -Duse_system_libexif=1 \ - -Duse_system_nspr=1 \ - -Dshared_process_mode=1 \ - -Denable_hidpi=1 - - ninja -j16 -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper xwalk-backendlib - - -} - crosswalk-dbg_files += "/usr/lib/xwalk/.debug" crosswalk-dbg_files += "/usr/lib/xwalk/.debug/libffmpegsumo.so" crosswalk-dbg_files += "/usr/lib/xwalk/.debug/xwalk" diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc index ee992d0..64a8945 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk.inc @@ -79,7 +79,7 @@ do_prep() { cp ${S}/packaging/crosswalk.manifest . cp ${S}/packaging/crosswalk.xml.in . cp ${S}/packaging/crosswalk.png . - sed "s/@VERSION@/10.38.210.0/g" crosswalk.xml.in > crosswalk.xml + sed "s/@VERSION@/10.38.217.0/g" crosswalk.xml.in > crosswalk.xml sed "s|@LIB_INSTALL_DIR@|${prefix}/lib|g" xwalk.in > xwalk sed "s|@LIB_INSTALL_DIR@|${prefix}/lib|g" xwalk.service.in > xwalk.service @@ -109,6 +109,13 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; + # Stop unconditionally passing -Wall to the compiler. Chromium has its own + # mechanisms for deciding which parts of the code need -Wall and which need it + # to be left out (since several pieces are built with -Werror). At least in + # M39, this is preventing the "rtc_base" target from being built because it + # does not expect -Wall to be passed to the compiler (see webrtc issue 3307). + export CXXFLAGS=`echo $CXXFLAGS | sed s,-Wall,,g` + # For ffmpeg on ia32. The original CFLAGS set by the gyp and config files in # src/third_party/ffmpeg already pass -O2 -fomit-frame-pointer, but Tizen's # CFLAGS end up appending -fno-omit-frame-pointer. See http://crbug.com/37246 @@ -134,7 +141,7 @@ do_compile() { ln -s "${BUILDDIR_NAME}" src/out fi - GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1" + GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_xdg_shell=1" # Force gold binary from chroot ld.gold provided by binutils-gold GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1 -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 " @@ -173,7 +180,7 @@ do_compile() { -Dshared_process_mode=1 \ -Denable_hidpi=1 - ninja -j16 -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper xwalk-backendlib + ninja -j16 -C src/out/Release xwalk xwalk_launcher xwalk_application_tools @@ -194,8 +201,6 @@ do_install() { install -p -D src/out/Release/xwalk ${D}${prefix}/lib/xwalk/xwalk install -p -D src/out/Release/xwalkctl ${D}${prefix}/bin/xwalkctl install -p -D src/out/Release/xwalk-launcher ${D}${prefix}/bin/xwalk-launcher - # xwalk-pkg-helper needs to be set-user-ID-root so it can finish the installation process. - install -m 0755 -p -D src/out/Release/xwalk-pkg-helper ${D}${prefix}/bin/xwalk-pkg-helper install -p -D src/out/Release/lib/libxwalk-backendlib.so ${D}${prefix}/lib/xwalk/libxwalk-backendlib.so install -p -D src/xwalk/application/tools/tizen/xwalk_backend_wrapper.sh ${D}${prefix}/lib/xwalk/xwalk_backend_wrapper.sh @@ -243,7 +248,6 @@ PACKAGES += " crosswalk " crosswalk_files = "" crosswalk_files += "${prefix}/bin/xwalkctl" crosswalk_files += "${prefix}/bin/xwalk-launcher" -crosswalk_files += "${prefix}/bin/xwalk-pkg-helper" crosswalk_files += "${prefix}/lib/xwalk/icudtl.dat" crosswalk_files += "${prefix}/lib/xwalk/libffmpegsumo.so" crosswalk_files += "${prefix}/lib/xwalk/xwalk" diff --git a/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb b/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb index 2a42f0f..e1a9237 100644 --- a/meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb +++ b/meta-tizen/recipes-tizen/crosswalk/crosswalk_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/framework/web/crosswalk;tag=167d85912d688ca20b2bde8759481aac82bd53a1;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=893693a3709897c9b72d899582bb7ebe29702aa9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc b/meta-tizen/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc index 0b4f765..fcc0042 100644 --- a/meta-tizen/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc +++ b/meta-tizen/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc @@ -20,5 +20,7 @@ do_compile_prepend() { } -FILES_${PN}-dbg = "${prefix}/lib/weston/.debug/ivi-controller.so" - +FILES_${PN}-dbg = "${prefix}/lib/weston/.debug" +FILES_${PN}-dbg = "${prefix}/bin/.debug" +FILES_${PN}-dbg = "${prefix}/src/debug" +FILES_${PN}-dbg = "${prefix}/lib/.debug" diff --git a/meta-tizen/recipes-tizen/hwdata/hwdata.inc b/meta-tizen/recipes-tizen/hwdata/hwdata.inc index 3b64a6d..de98a06 100644 --- a/meta-tizen/recipes-tizen/hwdata/hwdata.inc +++ b/meta-tizen/recipes-tizen/hwdata/hwdata.inc @@ -78,7 +78,7 @@ do_install() { rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - /bin/mkdir -p ${D}${sysconfdir}/modprobe.d + mkdir -p ${D}${sysconfdir}/modprobe.d mv ${D}${prefix}/lib/modprobe.d/dist-blacklist.conf \ ${D}${sysconfdir}/modprobe.d/blacklist.conf rm -rf ${D}${prefix}/lib diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps-extraconf.inc b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps-extraconf.inc index dfbf822..b745258 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps-extraconf.inc +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps-extraconf.inc @@ -3,5 +3,5 @@ do_configure_prepend() { sed -i 's@-I/usr/include@-I${STAGING_INCDIR}@g' ico-app-vicsample/src/Makefile.am } -FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.app-soundsample/bin/.debug/ico-app-soundsample" -FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.app-vicsample/bin/.debug/ico-app-vicsample" +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.app-soundsample/bin/.debug" +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.app-vicsample/bin/.debug" diff --git a/meta-tizen/recipes-tizen/libdrm/libdrm-extraconf.inc b/meta-tizen/recipes-tizen/libdrm/libdrm-extraconf.inc new file mode 100644 index 0000000..b677567 --- /dev/null +++ b/meta-tizen/recipes-tizen/libdrm/libdrm-extraconf.inc @@ -0,0 +1,3 @@ +do_install_append() { + rm -f ${D}${prefix}/bin/vbltest +} \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/libdrm/libdrm.inc b/meta-tizen/recipes-tizen/libdrm/libdrm.inc new file mode 100644 index 0000000..16371f6 --- /dev/null +++ b/meta-tizen/recipes-tizen/libdrm/libdrm.inc @@ -0,0 +1,208 @@ +DESCRIPTION = "Userspace interface to kernel DRM services" +HOMEPAGE = "http://cgit.freedesktop.org/mesa/drm" +SECTION = "Graphics & UI Framework/Libraries" +LICENSE = "MIT" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libdrm + + +#PROVIDES by libdrm-intel +PROVIDES += "libdrm-intel" + + +#PROVIDES by libdrm-dev +PROVIDES += "libdrm-dev" + + +#PROVIDES by libkms +PROVIDES += "libkms" + + +#PROVIDES by libdrm-tools +PROVIDES += "libdrm-tools" +# the PROVIDES rules is ignore "libdrm = 2.4.52-0" +PROVIDES += "libdrm" +RPROVIDES_libdrm-tools += "libdrm" + + +RDEPENDS = "" +#RDEPENDS of libdrm-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "libdrm" +RDEPENDS_${PN}-dev += "libdrm-intel" +RDEPENDS_${PN}-dev += "libkms" + + +DEPENDS = "" +#DEPENDS of libdrm +DEPENDS += "libpciaccess" +DEPENDS += "libpthread-stubs" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/libdrm.manifest . + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + autotools_do_configure + + oe_runmake -j16 + oe_runmake -j16 -C tests dristat drmstat + + + +} +EXTRA_OECONF += " --enable-static=yes --enable-udev --enable-libkms --disable-nouveau-experimental-api --disable-radeon --disable-nouveau --enable-exynos-experimental-api --enable-install-test-programs --disable-cairo-tests" + +do_install() { + 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 -- + mkdir -p ${D}${prefix}/bin + install \ + tests/.libs/dristat \ + tests/.libs/drmstat \ + ${D}${prefix}/bin + + rm -f ${D}${prefix}/bin/kmstest + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_libkms() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libkms() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libdrm-tools " +PACKAGES += " libdrm-intel " +PACKAGES += " libdrm " +PACKAGES += " libkms " +PACKAGES += " libdrm-dev " + +libdrm-tools_files = "" +libdrm-tools_files += "${prefix}/bin/dristat" +libdrm-tools_files += "${prefix}/bin/drmstat" +libdrm-tools_files += "${prefix}/bin/modeprint" +libdrm-tools_files += "${prefix}/bin/modetest" +MANIFESTFILES_${PN}-tools = "libdrm.manifest" + +libdrm-intel_files = "" +libdrm-intel_files += "${prefix}/lib/libdrm_intel.so.*" +MANIFESTFILES_${PN}-intel = "libdrm.manifest" + +libdrm_files = "" +libdrm_files += "${prefix}/lib/libdrm.so.*" +libdrm_files += "${prefix}/lib/libdrm_exynos.so.*" +libdrm_files += "${prefix}/lib/libdrm_vigs.so.*" +MANIFESTFILES_${PN} = "libdrm.manifest" + +libkms_files = "" +libkms_files += "${prefix}/lib/libkms.so.*" +MANIFESTFILES_libkms = "libdrm.manifest" + +libdrm-dev_files = "" +libdrm-dev_files += "${prefix}/include/libdrm" +libdrm-dev_files += "${prefix}/include/libdrm/*.h" +libdrm-dev_files += "${prefix}/include/libkms" +libdrm-dev_files += "${prefix}/include/libkms/*.h" +libdrm-dev_files += "${prefix}/include/exynos" +libdrm-dev_files += "${prefix}/include/exynos/*.h" +libdrm-dev_files += "${prefix}/include/*.h" +libdrm-dev_files += "${prefix}/lib/libdrm.so" +libdrm-dev_files += "${prefix}/lib/libdrm_intel.so" +libdrm-dev_files += "${prefix}/lib/libkms.so" +libdrm-dev_files += "${prefix}/lib/libdrm_exynos.so" +libdrm-dev_files += "${prefix}/lib/libdrm_vigs.so" +libdrm-dev_files += "${prefix}/lib/pkgconfig/*" +MANIFESTFILES_${PN}-dev = "libdrm.manifest" +DIRFILES_${PN}-dev = "" +DIRFILES_${PN}-dev += "${prefix}/include/libdrm" +DIRFILES_${PN}-dev += "${prefix}/include/libkms" +DIRFILES_${PN}-dev += "${prefix}/include/exynos" + +FILES_${PN}-tools = "${libdrm-tools_files}" +FILES_${PN}-intel = "${libdrm-intel_files}" +FILES_${PN} = "${libdrm_files}" +FILES_libkms = "${libkms_files}" +FILES_${PN}-dev = "${libdrm-dev_files}" + +PKG_libdrm-tools= "libdrm-tools" +PKG_libdrm-intel= "libdrm-intel" +PKG_libdrm= "libdrm" +PKG_libkms= "libkms" +PKG_libdrm-dev= "libdrm-dev" + +require libdrm-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/libdrm/libdrm_git.bb b/meta-tizen/recipes-tizen/libdrm/libdrm_git.bb new file mode 100644 index 0000000..ddc8f01 --- /dev/null +++ b/meta-tizen/recipes-tizen/libdrm/libdrm_git.bb @@ -0,0 +1,10 @@ +require libdrm.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/libdrm;tag=2a8aaf2b9f403cde35b88653394906af578845ab;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo-extraconf.inc b/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo.inc b/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo.inc new file mode 100644 index 0000000..74199f4 --- /dev/null +++ b/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo.inc @@ -0,0 +1,176 @@ +DESCRIPTION = "A MMX/SSE2 accelerated library for manipulating JPEG image files" +HOMEPAGE = "http://sourceforge.net/projects/libjpeg-turbo" +SECTION = "Graphics & UI Framework/Libraries" +LICENSE = "BSD-3-Clause" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libjpeg +PROVIDES += "libjpeg" +# the PROVIDES rules is ignore "libjpeg = 8.0.2" +# the PROVIDES rules is ignore "libjpeg8 " +PROVIDES += "libjpeg8" +RPROVIDES_libjpeg += "libjpeg8" + + +#PROVIDES by libjpeg-turbo + + +#PROVIDES by libjpeg-dev +PROVIDES += "libjpeg-dev" +# the PROVIDES rules is ignore "libjpeg-turbo-dev " +PROVIDES += "libjpeg-turbo-dev" +RPROVIDES_libjpeg-dev += "libjpeg-turbo-dev" +# the PROVIDES rules is ignore "libjpeg-dev = 8.0.2" +# the PROVIDES rules is ignore "libjpeg8-dev " +PROVIDES += "libjpeg8-dev" +RPROVIDES_libjpeg-dev += "libjpeg8-dev" + + +#PROVIDES by libjpeg-turbo-docs +PROVIDES += "libjpeg-turbo-docs " + + +RDEPENDS = "" +#RDEPENDS of libjpeg-dev (libjpeg-dev) +RDEPENDS_libjpeg-dev += "libjpeg" + + +DEPENDS = "" +#DEPENDS of libjpeg-turbo +DEPENDS_append_class-native = " libtool" +DEPENDS_append_class-target = " libtool-cross" +DEPENDS += "yasm" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/libjpeg-turbo.manifest . + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + autoreconf -fiv + + autotools_do_configure + make -j16 + + exit 0 + make test libdir=${prefix}/lib + + + +} +EXTRA_OECONF += " --disable-static --with-jpeg8" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + + oe_runmake \ + DESTDIR=${D} \ + BINDIR=${prefix}/bin \ + prefix=${prefix} \ + exec_prefix=${prefix} \ + bindir=${prefix}/bin \ + sbindir=${prefix}/sbin \ + sysconfdir=${sysconfdir} \ + datadir=${prefix}/share \ + includedir=${prefix}/include \ + libdir=${prefix}/lib \ + libexecdir=${prefix}/libexec \ + localstatedir=}${localstatedir} \ + sharedstatedir=${prefix}/com \ + mandir=${mandir} \ + infodir=${infodir} \ + install + + # Fix perms + chmod -x README-turbo.txt release/copyright + + # Remove unwanted files + rm -f ${D}${prefix}/lib/lib{,turbo}jpeg.la + + rm ${D}${prefix}/bin/tjbench + + # Remove docs, we'll select docs manually + rm -rf ${D}${prefix}/share/doc/ + + +} + +pkg_postinst_libjpeg() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libjpeg() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libjpeg " +PACKAGES += " libjpeg-turbo " +PACKAGES += " libjpeg-turbo-docs " +PACKAGES += " libjpeg-dev " + +libjpeg_files = "" +libjpeg_files += "${prefix}/lib/libturbojpeg.so" +libjpeg_files += "${prefix}/lib/libjpeg.so.8.0.2" +libjpeg_files += "${prefix}/lib/libjpeg.so.8" +MANIFESTFILES_libjpeg = "libjpeg-turbo.manifest" + +libjpeg-turbo_files = "" +libjpeg-turbo_files += "${prefix}/bin/*" +MANIFESTFILES_${PN} = "libjpeg-turbo.manifest" + +libjpeg-turbo-docs_files = "" + +libjpeg-dev_files = "" +libjpeg-dev_files += "${prefix}/include/*.h" +libjpeg-dev_files += "${prefix}/lib/libjpeg.so" +libjpeg-dev_files += "coderules.txt jconfig.txt libjpeg.txt structure.txt example.c" +MANIFESTFILES_libjpeg-dev = "libjpeg-turbo.manifest" + +FILES_libjpeg = "${libjpeg_files}" +FILES_${PN} = "${libjpeg-turbo_files}" +FILES_${PN}-docs = "${libjpeg-turbo-docs_files}" +FILES_libjpeg-dev = "${libjpeg-dev_files}" + +PKG_libjpeg= "libjpeg" +PKG_libjpeg-turbo= "libjpeg-turbo" +PKG_libjpeg-turbo-docs= "libjpeg-turbo-docs" +PKG_libjpeg-dev= "libjpeg-dev" + +require libjpeg-turbo-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo_git.bb b/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo_git.bb new file mode 100644 index 0000000..857d2c1 --- /dev/null +++ b/meta-tizen/recipes-tizen/libjpeg-turbo/libjpeg-turbo_git.bb @@ -0,0 +1,10 @@ +require libjpeg-turbo.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/libjpeg-turbo;tag=92e0ae092a0cb7d193d58e7f2904571669214dc5;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/libxml2/files/ansidecl.patch b/meta-tizen/recipes-tizen/libxml2/files/ansidecl.patch new file mode 100644 index 0000000..2452d78 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/files/ansidecl.patch @@ -0,0 +1,25 @@ +Sadly cmake is broken. If it sees this reference and ansidecl is present, it will add a +dependency upon it, even if HAVE_ANSIDEC_H is never set. + +The easiest solution is to remove these lines, otherwise recipes like libzypp can have a +dependency on the ansidecl.h header via cmake. This can lead to odd results if the +header is removed (clean binutils) and then the code is recompiled. + +RP 2012/7/10 + +Upstream-Status: Inappropriate [its really a cmake bug] + +Index: libxml2-2.8.0/include/libxml/xmlversion.h.in +=================================================================== +--- libxml2-2.8.0.orig/include/libxml/xmlversion.h.in 2012-07-10 11:51:52.460750573 +0000 ++++ libxml2-2.8.0/include/libxml/xmlversion.h.in 2012-07-10 11:52:41.436749397 +0000 +@@ -401,9 +401,6 @@ + #endif + + #ifdef __GNUC__ +-#ifdef HAVE_ANSIDECL_H +-#include +-#endif + + /** + * ATTRIBUTE_UNUSED: diff --git a/meta-tizen/recipes-tizen/libxml2/files/libxml-64bit.patch b/meta-tizen/recipes-tizen/libxml2/files/libxml-64bit.patch new file mode 100644 index 0000000..1147017 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/files/libxml-64bit.patch @@ -0,0 +1,22 @@ +Upstream-Status: Backport [from debian: bugs.debian.org/439843] + +--- + libxml.h | 3 +++ + 1 file changed, 3 insertions(+) + +--- libxml2-2.6.29.orig/libxml.h ++++ libxml2-2.6.29/libxml.h +@@ -11,10 +11,13 @@ + + #ifndef NO_LARGEFILE_SOURCE + #ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE + #endif ++#ifndef _LARGEFILE64_SOURCE ++#define _LARGEFILE64_SOURCE ++#endif + #ifndef _FILE_OFFSET_BITS + #define _FILE_OFFSET_BITS 64 + #endif + #endif + diff --git a/meta-tizen/recipes-tizen/libxml2/files/libxml2-CVE-2014-0191-fix.patch b/meta-tizen/recipes-tizen/libxml2/files/libxml2-CVE-2014-0191-fix.patch new file mode 100644 index 0000000..1c05ae6 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/files/libxml2-CVE-2014-0191-fix.patch @@ -0,0 +1,37 @@ +From: Daniel Veillard +Date: Tue, 22 Apr 2014 15:30:56 +0800 +Subject: Do not fetch external parameter entities + +Unless explicitely asked for when validating or replacing entities +with their value. Problem pointed out by Daniel Berrange + +Upstream-Status: Backport +Reference: https://access.redhat.com/security/cve/CVE-2014-0191 + +Signed-off-by: Daniel Veillard +Signed-off-by: Maxin B. John +--- +diff -Naur libxml2-2.9.1-orig/parser.c libxml2-2.9.1/parser.c +--- libxml2-2.9.1-orig/parser.c 2013-04-16 15:39:18.000000000 +0200 ++++ libxml2-2.9.1/parser.c 2014-05-07 13:35:46.883687946 +0200 +@@ -2595,6 +2595,20 @@ + xmlCharEncoding enc; + + /* ++ * Note: external parsed entities will not be loaded, it is ++ * not required for a non-validating parser, unless the ++ * option of validating, or substituting entities were ++ * given. Doing so is far more secure as the parser will ++ * only process data coming from the document entity by ++ * default. ++ */ ++ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && ++ ((ctxt->options & XML_PARSE_NOENT) == 0) && ++ ((ctxt->options & XML_PARSE_DTDVALID) == 0) && ++ (ctxt->validate == 0)) ++ return; ++ ++ /* + * handle the extra spaces added before and after + * c.f. http://www.w3.org/TR/REC-xml#as-PE + * this is done independently. diff --git a/meta-tizen/recipes-tizen/libxml2/files/python-sitepackages-dir.patch b/meta-tizen/recipes-tizen/libxml2/files/python-sitepackages-dir.patch new file mode 100644 index 0000000..a697ddf --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/files/python-sitepackages-dir.patch @@ -0,0 +1,21 @@ +Allow us to pass in PYTHON_SITE_PACKAGES + +The python binary used when building for nativesdk doesn't give us the +correct path here so we need to be able to specify it ourselves. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton + +--- a/configure.in ++++ b/configure.in +@@ -743,7 +743,8 @@ dnl + + PYTHON_VERSION= + PYTHON_INCLUDES= +-PYTHON_SITE_PACKAGES= ++# Allow this to be set externally ++#PYTHON_SITE_PACKAGES= + PYTHON_TESTS= + pythondir= + if test "$with_python" != "no" ; then diff --git a/meta-tizen/recipes-tizen/libxml2/files/run-ptest b/meta-tizen/recipes-tizen/libxml2/files/run-ptest new file mode 100644 index 0000000..473d0b6 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/files/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -k runtests diff --git a/meta-tizen/recipes-tizen/libxml2/libxml2-extraconf.inc b/meta-tizen/recipes-tizen/libxml2/libxml2-extraconf.inc new file mode 100644 index 0000000..4ea0097 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/libxml2-extraconf.inc @@ -0,0 +1,72 @@ +DEPENDS_class-nativesdk = "nativesdk-python" +DEPENDS_class-native = "python-native" +DEPENDS =+ "zlib" + +SRC_URI = "file://libxml-64bit.patch \ + file://ansidecl.patch \ + file://run-ptest \ + file://libxml2-CVE-2014-0191-fix.patch \ + file://python-sitepackages-dir.patch \ + " + +BINCONFIG = "${bindir}/xml2-config" + +#inherit autotools pkgconfig binconfig-disabled pythonnative ptest +inherit pkgconfig binconfig-disabled pythonnative + +RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" + +# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header +do_configure_prepend () { + sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in +} + +do_configure_prepend_class-nativesdk () { + # Ensure we get the correct site-packages path + export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" +} + +do_compile_prepend_class-nativesdk () { + # Ensure we get the correct site-packages path + export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" +} + +EXTRA_OECONF += "--without-python " +#EXTRA_OECONF += "--without-python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" + +EXTRA_OECONF_class-native += "--with-python=${STAGING_BINDIR}/python " +#EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma" + +EXTRA_OECONF_class-nativesdk += "--with-python=${STAGING_BINDIR}/python " +#EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --without-docbook --with-c14n --without-lzma" + +EXTRA_OECONF_linuxstdbase += "--without-python " +#EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-docbook --with-c14n --without-lzma" + +# required for pythong binding +export HOST_SYS +export BUILD_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + +export LDFLAGS += "-ldl" + +python populate_packages_prepend () { + # autonamer would call this libxml2-2, but we don't want that + if d.getVar('DEBIAN_NAMES', True): + d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') +} + +PACKAGES += "${PN}-utils ${PN}-python" + +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +#FILES_${PN}-dev += "${libdir}/xml2Conf.sh" +#FILES_${PN}-utils += "${bindir}/*" +FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" + +#do_install_ptest () { +# cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} +#} + +BBCLASSEXTEND = "native nativesdk" \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/libxml2/libxml2.inc b/meta-tizen/recipes-tizen/libxml2/libxml2.inc new file mode 100644 index 0000000..adfebd9 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/libxml2.inc @@ -0,0 +1,156 @@ +DESCRIPTION = "A Library to Manipulate XML Files" +HOMEPAGE = "http://xmlsoft.org" +SECTION = "System/Libraries" +LICENSE = "MIT" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libxml2 + + +#PROVIDES by libxml2-dev +PROVIDES += "libxml2-dev" + + +#PROVIDES by libxml2-tools +PROVIDES += "libxml2-tools" + + +RDEPENDS = "" +#RDEPENDS of libxml2-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "libxml2" +RDEPENDS_${PN}-dev += "zlib" +RDEPENDS_${PN}-dev += "xz" +RDEPENDS_${PN}-dev += "eglibc" +RDEPENDS_${PN}-dev += "libxml2-tools" +RDEPENDS_${PN}-dev += "readline" + + +DEPENDS = "" +#DEPENDS of libxml2 +DEPENDS += "xz" +DEPENDS_append_class-native = " readline-native" +DEPENDS_append_class-target = " readline-native" +DEPENDS += "zlib" +inherit pkgconfig + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/libxml2.manifest . + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + autotools_do_configure + + make -j16 BASE_DIR="${prefix}/share/doc/packages" DOC_MODULE="libxml2" + + exit 0 + # qemu-arm can't keep up atm, disabling check for arm + make check + + + +} +EXTRA_OECONF += " --disable-static --docdir=${prefix}/share/doc/packages/libxml2 --with-html-dir=${prefix}/share/doc/packages/libxml2/html --with-fexceptions --with-history --without-python --enable-ipv6 --with-sax1 --with-regexps --with-threads --with-reader --with-http" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + make install DESTDIR="${D}" BASE_DIR="${prefix}/share/doc/packages" DOC_MODULE="libxml2" + ln -s libxml2/libxml ${D}${prefix}/include/libxml + + + rm -rf ${D}${infodir} + rm -rf ${D}${prefix}/share/doc/packages + rm -rf ${D}${prefix}/share/doc/libxml2 + rm -rf ${D}${prefix}/share/doc/libxml2-2.8.0 + rm -rf ${D}${prefix}/share/gtk-doc + rm -rf ${D}${prefix}/share/doc + rm -rf ${D}${prefix}/share/man + find ${D} -regex ".*/man/man./.*.[0-9]" | xargs rm -f -- + find ${D} -regex ".*/man/../man./.*.[0-9]" | xargs rm -f -- + find ${D} -regex ".*/man/man./.*.[0-9]pm" | xargs rm -f -- + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libxml2 " +PACKAGES += " libxml2-dev " +PACKAGES += " libxml2-tools " + +libxml2_files = "" +libxml2_files += "${prefix}/lib/lib*.so.*" +MANIFESTFILES_${PN} = "libxml2.manifest" + +libxml2-dev_files = "" +libxml2-dev_files += "${prefix}/bin/xml2-config" +libxml2-dev_files += "${prefix}/share/aclocal" +libxml2-dev_files += "${prefix}/share/aclocal/libxml.m4" +libxml2-dev_files += "${prefix}/include/libxml" +libxml2-dev_files += "${prefix}/include/libxml2" +libxml2-dev_files += "${prefix}/lib/lib*.so" +libxml2-dev_files += "${prefix}/lib/libxml2.la" +libxml2-dev_files += "${prefix}/lib/*.sh" +libxml2-dev_files += "${prefix}/lib/pkgconfig/*.pc" +MANIFESTFILES_${PN}-dev = "libxml2.manifest" +DIRFILES_${PN}-dev = "" +DIRFILES_${PN}-dev += "${prefix}/share/aclocal" + +libxml2-tools_files = "" +libxml2-tools_files += "${prefix}/bin/xmllint" +libxml2-tools_files += "${prefix}/bin/xmlcatalog" +MANIFESTFILES_${PN}-tools = "libxml2.manifest" + +FILES_${PN} = "${libxml2_files}" +FILES_${PN}-dev = "${libxml2-dev_files}" +FILES_${PN}-tools = "${libxml2-tools_files}" + +PKG_libxml2= "libxml2" +PKG_libxml2-dev= "libxml2-dev" +PKG_libxml2-tools= "libxml2-tools" + +require libxml2-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/libxml2/libxml2_git.bb b/meta-tizen/recipes-tizen/libxml2/libxml2_git.bb new file mode 100644 index 0000000..0356133 --- /dev/null +++ b/meta-tizen/recipes-tizen/libxml2/libxml2_git.bb @@ -0,0 +1,10 @@ +require libxml2.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/libxml2;tag=e52e7cd8d3553116787eb0573f3b3d379f09698a;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb b/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb index 16f4337..cae73ae 100644 --- a/meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb +++ b/meta-tizen/recipes-tizen/meta-generic/meta-generic_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/upstream/meta-generic;tag=966ec85226e3aeb07dc4294d77c32a5746994690;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=e004cf9375570711deb255f5ccc1b774b204d4d7;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/python-libxml2/python-libxml2-extraconf.inc b/meta-tizen/recipes-tizen/python-libxml2/python-libxml2-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen/recipes-tizen/python-libxml2/python-libxml2.inc b/meta-tizen/recipes-tizen/python-libxml2/python-libxml2.inc new file mode 100644 index 0000000..1fea77d --- /dev/null +++ b/meta-tizen/recipes-tizen/python-libxml2/python-libxml2.inc @@ -0,0 +1,103 @@ +DESCRIPTION = "Python Bindings for libxml2" +HOMEPAGE = "http://xmlsoft.org" +SECTION = "Platform Development/Python" +LICENSE = "MIT" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by python-libxml2 +# the PROVIDES rules is ignore "libxml2-python = 2.8.0" +PROVIDES += "libxml2-python" +RPROVIDES_python-libxml2 += "libxml2-python" + + +RDEPENDS = "" +#RDEPENDS of python-libxml2 (${PN}) +RDEPENDS_${PN} += "libxml2" + + +DEPENDS = "" +#DEPENDS of python-libxml2 +inherit pythonnative +DEPENDS += "libxml2" +DEPENDS += "python-xml" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q -n libxml2-2.8.0 + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + export CFLAGS="$CFLAGS -fno-strict-aliasing" + + autotools_do_configure + + # use libxml2 as built by libxml2 source package + mkdir .libs + cp -v ${prefix}/lib/libxml2.la . + make -C python -j16 + + + +} +EXTRA_OECONF += " --with-fexceptions --with-history --enable-ipv6 --with-sax1 --with-regexps --with-threads --with-reader --with-http" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + make -C python install \ + DESTDIR=${D} \ + pythondir=/usr/lib/python2.7/site-packages \ + PYTHON_SITE_PACKAGES=/usr/lib/python2.7/site-packages + chmod a-x python/tests/*.py + # Unwanted doc stuff + rm -fr ${D}${prefix}/share/doc + rm -f python/tests/Makefile* + # #223696 + rm -f ${D}/usr/lib/python2.7/site-packages/*.{la,a} + + +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " python-libxml2 " + +python-libxml2_files = "" +python-libxml2_files += "python/libxml2class.txt" +python-libxml2_files += "python/tests" +python-libxml2_files += "/usr/lib/python2.7/site-packages/*" + +FILES_${PN} = "${python-libxml2_files}" + +PKG_python-libxml2= "python-libxml2" + +require python-libxml2-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/python-libxml2/python-libxml2_git.bb b/meta-tizen/recipes-tizen/python-libxml2/python-libxml2_git.bb new file mode 100644 index 0000000..e5c584c --- /dev/null +++ b/meta-tizen/recipes-tizen/python-libxml2/python-libxml2_git.bb @@ -0,0 +1,10 @@ +require python-libxml2.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/libxml2;tag=e52e7cd8d3553116787eb0573f3b3d379f09698a;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/python-setuptools/python-setuptools-extraconf.inc b/meta-tizen/recipes-tizen/python-setuptools/python-setuptools-extraconf.inc index e69de29..4b94c9c 100644 --- a/meta-tizen/recipes-tizen/python-setuptools/python-setuptools-extraconf.inc +++ b/meta-tizen/recipes-tizen/python-setuptools/python-setuptools-extraconf.inc @@ -0,0 +1,5 @@ +# required for pythong binding +export HOST_SYS +export BUILD_SYS +export STAGING_LIBDIR +export STAGING_INCDIR \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/python-setuptools/python-setuptools.inc b/meta-tizen/recipes-tizen/python-setuptools/python-setuptools.inc index b3b4149..9205181 100644 --- a/meta-tizen/recipes-tizen/python-setuptools/python-setuptools.inc +++ b/meta-tizen/recipes-tizen/python-setuptools/python-setuptools.inc @@ -52,8 +52,8 @@ do_compile() { cp ${S}/packaging/python-setuptools.manifest . find -name '*.txt' | xargs chmod -x - find -name '*.py' | xargs sed -i '1s|^#!python|#!/usr/bin/python|' - CFLAGS="$RPM_OPT_FLAGS" /usr/bin/python setup.py build + find -name '*.py' | xargs sed -i '1s|^#!python|#!python|' + CFLAGS="$RPM_OPT_FLAGS" python setup.py build @@ -68,7 +68,7 @@ do_install() { rm -rf ${D} mkdir -p ${D} - /usr/bin/python setup.py install -O1 --skip-build \ + python setup.py install -O1 --skip-build \ --root $RPM_BUILD_ROOT \ --prefix ${prefix} \ --single-version-externally-managed diff --git a/meta-tizen/recipes-tizen/tiff/tiff-extraconf.inc b/meta-tizen/recipes-tizen/tiff/tiff-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen/recipes-tizen/tiff/tiff.inc b/meta-tizen/recipes-tizen/tiff/tiff.inc new file mode 100644 index 0000000..39c7b29 --- /dev/null +++ b/meta-tizen/recipes-tizen/tiff/tiff.inc @@ -0,0 +1,158 @@ +DESCRIPTION = "Tools for Converting from and to the Tiff Format" +HOMEPAGE = "http://www.remotesensing.org/libtiff" +SECTION = "Productivity/Graphics/Convertors" +LICENSE = "HPND" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libtiff +PROVIDES += "libtiff" + + +#PROVIDES by tiff + + +#PROVIDES by tiff-docs +PROVIDES += "tiff-docs " + + +#PROVIDES by libtiff-dev +PROVIDES += "libtiff-dev" + + +RDEPENDS = "" +#RDEPENDS of libtiff-dev (lib${PN}-dev) +RDEPENDS_lib${PN}-dev += "eglibc" +RDEPENDS_lib${PN}-dev += "libtiff" +RDEPENDS_lib${PN}-dev += "libstdc++-dev" + + +DEPENDS = "" +#DEPENDS of tiff +DEPENDS += "libjpeg-turbo" +DEPENDS += "zlib" +inherit pkgconfig +DEPENDS += "xz" +DEPENDS_append_class-native = " libtool" +DEPENDS_append_class-target = " libtool-cross" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/tiff.manifest . + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + + autotools_do_configure + make -j16 + + + +} +EXTRA_OECONF += " --disable-static --with-pic" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + mkdir -p ${D}/{${mandir}/{man1,man3},usr/{bin,lib,include}} + + 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 -- + for f in `find ${D}/${mandir} -type f -print ` ; do + if [ `wc -l <$f` -eq 1 ] && grep -q "^\.so " $f ; then + linkto=`sed -e "s|^\.so ||" $f` + [ -f "`dirname $f`/$linkto" ] && ln -sf "$linkto" $f + fi + done + + rm -rf ${D}${prefix}/share/doc/tiff* + rm -f ${D}/${prefix}/lib/*.la + find html -name "Makefile*" | xargs rm + + + + +} + +pkg_postinst_libtiff() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libtiff() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " tiff " +PACKAGES += " tiff-docs " +PACKAGES += " libtiff " +PACKAGES += " libtiff-dev " + +tiff_files = "" +tiff_files += "${prefix}/bin/*" +MANIFESTFILES_${PN} = "tiff.manifest" + +tiff-docs_files = "" + +libtiff_files = "" +libtiff_files += "COPYRIGHT" +libtiff_files += "${prefix}/lib/*.so.*" +MANIFESTFILES_lib${PN} = "tiff.manifest" + +libtiff-dev_files = "" +libtiff-dev_files += "${prefix}/include/*" +libtiff-dev_files += "${prefix}/lib/*.so" +libtiff-dev_files += "${prefix}/lib/pkgconfig/*.pc" +MANIFESTFILES_lib${PN}-dev = "tiff.manifest" + +FILES_${PN} = "${tiff_files}" +FILES_${PN}-docs = "${tiff-docs_files}" +FILES_lib${PN} = "${libtiff_files}" +FILES_lib${PN}-dev = "${libtiff-dev_files}" + +PKG_tiff= "tiff" +PKG_tiff-docs= "tiff-docs" +PKG_libtiff= "libtiff" +PKG_libtiff-dev= "libtiff-dev" + +require tiff-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/tiff/tiff_git.bb b/meta-tizen/recipes-tizen/tiff/tiff_git.bb new file mode 100644 index 0000000..f395b65 --- /dev/null +++ b/meta-tizen/recipes-tizen/tiff/tiff_git.bb @@ -0,0 +1,10 @@ +require tiff.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/upstream/tiff;tag=2d1548a92a4768584c545d5c40fa203883612eb0;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets_git.bb b/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets_git.bb index 4cadfd2..d8fdec2 100644 --- a/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets_git.bb +++ b/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets_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/profile/common/wrt-widgets;tag=044e7781b29f2232cd25fa8bea1db229b7077bf0;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/common/wrt-widgets;tag=e84337cd05c5879886ab5a87ef68c500d64cbab7;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4