[PATCH 1/8] libsdl-gfx: initial add 2.0.25

[PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Andreas Müller]

Recipes like this live in in meta-games and meta-game-emulators. Once applied
here, pull requests will go out.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb

diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
new file mode 100644
index 000000000..c9910cb1b
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
@@ -0,0 +1,20 @@
+SUMMARY = "SDL graphics drawing primitives and other support functions"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
+
+DEPENDS = "virtual/libsdl"
+
+SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
+SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16"
+SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
+
+S = "${WORKDIR}/SDL_gfx-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF += " \
+    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \
+    --disable-mmx \
+"
+
-- 
2.14.4

[PATCH 2/8] openjpeg: cmake fixes to prepare update of poppler

[Andreas Müller]

* Move *,cmake from ${libdir}/cmake to ${libdir}/cmake/<name-and-version>
  That is standard location cmake files are installed.
* Do not export executables - they will not be found in dependant's sysroot

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...ke-files-are-installed-at-common-location.patch | 48 ++++++++++++++++++++++
 ...cmake-to-export-binaries-they-don-t-make-.patch | 31 ++++++++++++++
 .../recipes-graphics/openjpeg/openjpeg_2.3.0.bb    | 10 ++---
 3 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
 create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
new file mode 100644
index 000000000..5c5fe64f2
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
@@ -0,0 +1,48 @@
+From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Thu, 27 Sep 2018 23:45:04 +0200
+Subject: [PATCH] Ensure cmake files are installed at common location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Otherwise recent poppler is not able to find them
+* Include path needs adjustment with this change
+
+Upstream-Status: Inappropriate [Configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ CMakeLists.txt                | 2 +-
+ cmake/OpenJPEGConfig.cmake.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ff70a06f..23d2fac4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+   # We could install *.cmake files in share/ however those files contains
+   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
+   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
+-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
+ endif()
+ 
+ if (APPLE)
+diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
+index b20294ca..6a2f4baf 100644
+--- a/cmake/OpenJPEGConfig.cmake.in
++++ b/cmake/OpenJPEGConfig.cmake.in
+@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+   # This is an install tree
+   include(${SELF_DIR}/OpenJPEGTargets.cmake)
+-  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
++  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
+ 
+ else()
+-- 
+2.14.4
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
new file mode 100644
index 000000000..0ba13cf88
--- /dev/null
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
@@ -0,0 +1,31 @@
+From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 28 Sep 2018 00:38:50 +0200
+Subject: [PATCH] Do not ask cmake to export binaries - they don't make it
+ dependants sysroots
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/bin/jp2/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
+index 4324c36d..2c11fe02 100644
+--- a/src/bin/jp2/CMakeLists.txt
++++ b/src/bin/jp2/CMakeLists.txt
+@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
+   endif()
+   # Install exe
+   install(TARGETS ${exe}
+-    EXPORT OpenJPEGTargets
+     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+   )
+   if(OPJ_USE_DSYMUTIL)
+-- 
+2.14.4
+
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
index d5d06206d..c50d55e4b 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
@@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
 
 DEPENDS = "libpng tiff lcms zlib"
 
-SRC_URI = "git://github.com/uclouvain/openjpeg.git"
+SRC_URI = " \
+    git://github.com/uclouvain/openjpeg.git \
+    file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \
+    file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+"
 SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b"
 S = "${WORKDIR}/git"
 
 inherit cmake
-
-# standard path for *.cmake
-EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \
-                  -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}"
-- 
2.14.4

[PATCH 3/8] poppler: upgrade 0.67.0 -> 0.69.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../recipes-support/poppler/{poppler_0.67.0.bb => poppler_0.69.0.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/poppler/{poppler_0.67.0.bb => poppler_0.69.0.bb} (94%)

diff --git a/meta-oe/recipes-support/poppler/poppler_0.67.0.bb b/meta-oe/recipes-support/poppler/poppler_0.69.0.bb
similarity index 94%
rename from meta-oe/recipes-support/poppler/poppler_0.67.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.69.0.bb
index 210c87112..f7e34cf2a 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.67.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.69.0.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
            file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \
            file://basename-include.patch \
            "
-SRC_URI[md5sum] = "bcfbdcaca2a1f72435e4aaa3c06664ca"
-SRC_URI[sha256sum] = "a34a4f1a0f5b610c584c65824e92e3ba3e08a89d8ab4622aee11b8ceea5366f9"
+SRC_URI[md5sum] = "0881d921de62673ab558872dadc2b27b"
+SRC_URI[sha256sum] = "637ff943f805f304ff1da77ba2e7f1cbd675f474941fd8ae1e0fc01a5b45a3f9"
 
 DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
 
-- 
2.14.4

[PATCH 4/8] xfce4-whiskermenu-plugin: upgrade 2.2.1 -> 2.3.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-whiskermenu-plugin_2.2.1.bb => xfce4-whiskermenu-plugin_2.3.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.2.1.bb => xfce4-whiskermenu-plugin_2.3.0.bb} (66%)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.2.1.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.0.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.2.1.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.0.bb
index c21cc94bc..24a32fc0a 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.2.1.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit xfce-panel-plugin cmake
 
-SRC_URI[md5sum] = "8d202b984e6bdf9c96fc8b0701f881cc"
-SRC_URI[sha256sum] = "b5f8efcc94cb26e4394ae599ac5955d745f3c11c39605036709ede5454f302b9"
+SRC_URI[md5sum] = "d2383c3eb1b54adf5a206973bd20f159"
+SRC_URI[sha256sum] = "7e569bb0dff7e3db3d964e23323f54c6de7249741c6a0e33a0fa501d83040b16"
 
 RRECOMMENDS_${PN} += "menulibre"
-- 
2.14.4

[PATCH 5/8] xfce4-battery-plugin: upgrade 1.1.0 -> 1.1.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-battery-plugin_1.1.0.bb => xfce4-battery-plugin_1.1.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/battery/{xfce4-battery-plugin_1.1.0.bb => xfce4-battery-plugin_1.1.1.bb} (66%)

diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.bb
similarity index 66%
rename from meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb
rename to meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.bb
index 9d2d954f0..af7c65aa0 100644
--- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb
+++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "f78d8d0cc13d40753a207a836869b953"
-SRC_URI[sha256sum] = "8c9deec8d95da4cc39d6d9091433e5822b6bbe07d80117045dd4dd3480427ece"
+SRC_URI[md5sum] = "26941c579ebf4143b7e49aa08ee9b30a"
+SRC_URI[sha256sum] = "1e94969b93e0c1d6da87364b64c0cdfb40bae5e4a055039be8b67b9e5b3dd44b"
-- 
2.14.4

[PATCH 6/8] xfce4-cpufreq-plugin: upgrade 1.2.0 -> 1.2.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-cpufreq-plugin_1.2.0.bb => xfce4-cpufreq-plugin_1.2.1.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/cpufreq/{xfce4-cpufreq-plugin_1.2.0.bb => xfce4-cpufreq-plugin_1.2.1.bb} (64%)

diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.0.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
similarity index 64%
rename from meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.0.bb
rename to meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
index e8ce6b09d..3f5587d80 100644
--- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.0.bb
+++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "152c4c5d9fd926081753d289c18a04c3"
-SRC_URI[sha256sum] = "fec60f14ab02b7079798809c11a79b4930abaeb0e4217068a336cb63cb47970a"
+SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f"
+SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5"
-- 
2.14.4

[PATCH 7/8] xfce4-weather-plugin: upgrade 0.8.10 -> 0.9.0

[Andreas Müller]

Yet another smooth GTK3 transition

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-weather-plugin_0.8.10.bb => xfce4-weather-plugin_0.9.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/weather/{xfce4-weather-plugin_0.8.10.bb => xfce4-weather-plugin_0.9.0.bb} (72%)

diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.0.bb
similarity index 72%
rename from meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb
rename to meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.0.bb
index 649eaaafb..1663bb9af 100644
--- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb
+++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.0.bb
@@ -7,7 +7,7 @@ inherit xfce-panel-plugin
 
 DEPENDS += "libsoup-2.4 dbus-glib upower"
 
-SRC_URI[md5sum] = "bba7f750b97c8fc3656715268edad792"
-SRC_URI[sha256sum] = "ee6d43c444904631c240470e15e96215c2ce451158bfdbf234bce892bf60eab8"
+SRC_URI[md5sum] = "25d3d9fb2e688a619201655f6eea51c2"
+SRC_URI[sha256sum] = "34368cf2332774ad2a05226b2914ecb60e7550e9b2164be53ebe8f370198bb3d"
 
 FILES_${PN} += "${datadir}/xfce4/weather"
-- 
2.14.4

[PATCH 8/8] xfce4-appfinder: upgrade 4.13.0 -> 4.13.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-appfinder_4.13.0.bb => xfce4-appfinder_4.13.1.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfce4-appfinder/{xfce4-appfinder_4.13.0.bb => xfce4-appfinder_4.13.1.bb} (69%)

diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb
similarity index 69%
rename from meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb
rename to meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb
index 7e7391167..0336f54ba 100644
--- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb
@@ -8,7 +8,7 @@ inherit xfce distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[md5sum] = "6b6cf080c891f7945953f8084a901552"
-SRC_URI[sha256sum] = "c0eb3b29eba3cfa9175ed35174e83a21faa2a2423ddb79501fe8846cc430e3ae"
+SRC_URI[md5sum] = "9e2a1f9b4ae3183c461b79891224c33f"
+SRC_URI[sha256sum] = "5cabb27bbe0a0864b785e1a38535a91516763e38d6bff41a3915a61d28254b03"
 
 FILES_${PN} += "${datadir}/appdata"
-- 
2.14.4

Re: [PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Khem Raj]

On Wed, Oct 3, 2018 at 12:25 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> Recipes like this live in in meta-games and meta-game-emulators. Once applied
> here, pull requests will go out.
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>  create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
>
> diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
> new file mode 100644
> index 000000000..c9910cb1b
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
> @@ -0,0 +1,20 @@
> +SUMMARY = "SDL graphics drawing primitives and other support functions"
> +SECTION = "libs"
> +LICENSE = "Zlib"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
> +
> +DEPENDS = "virtual/libsdl"
> +
> +SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
> +SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16"
> +SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
> +
> +S = "${WORKDIR}/SDL_gfx-${PV}"
> +
> +inherit autotools pkgconfig
> +
> +EXTRA_OECONF += " \
> +    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \

is the intention to have SDL_CONFIG point to pkg-config here

> +    --disable-mmx \
> +"
> +
> --
> 2.14.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Andreas Müller]

On Wed, Oct 3, 2018 at 10:32 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Wed, Oct 3, 2018 at 12:25 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > Recipes like this live in in meta-games and meta-game-emulators. Once applied
> > here, pull requests will go out.
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >  meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> >  create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
> >
> > diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
> > new file mode 100644
> > index 000000000..c9910cb1b
> > --- /dev/null
> > +++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
> > @@ -0,0 +1,20 @@
> > +SUMMARY = "SDL graphics drawing primitives and other support functions"
> > +SECTION = "libs"
> > +LICENSE = "Zlib"
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
> > +
> > +DEPENDS = "virtual/libsdl"
> > +
> > +SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
> > +SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16"
> > +SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
> > +
> > +S = "${WORKDIR}/SDL_gfx-${PV}"
> > +
> > +inherit autotools pkgconfig
> > +
> > +EXTRA_OECONF += " \
> > +    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \
>
> is the intention to have SDL_CONFIG point to pkg-config here
>
I was under the impression it replaces sdl-config (sdl-config supports
for basic stuff as cflags and libs same arguments as pkg-config). Now
that you ask I checked and grepping did not show my why I should set
it (it is mentioned in the doc but...).
So I tested and it builds fine without setting SDL_CONFIG. So V2 is
near - thanks for the pointer.

Andreas

Re: [PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Khem Raj]

[-- Attachment #1.1: Type: text/plain, Size: 2135 bytes --]

Hi Andreas


On 10/3/18 1:56 PM, Andreas Müller wrote:
> On Wed, Oct 3, 2018 at 10:32 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Wed, Oct 3, 2018 at 12:25 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>>>
>>> Recipes like this live in in meta-games and meta-game-emulators. Once applied
>>> here, pull requests will go out.
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>>> ---
>>>  meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb | 20 ++++++++++++++++++++
>>>  1 file changed, 20 insertions(+)
>>>  create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
>>>
>>> diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
>>> new file mode 100644
>>> index 000000000..c9910cb1b
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
>>> @@ -0,0 +1,20 @@
>>> +SUMMARY = "SDL graphics drawing primitives and other support functions"
>>> +SECTION = "libs"
>>> +LICENSE = "Zlib"
>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
>>> +
>>> +DEPENDS = "virtual/libsdl"
>>> +
>>> +SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
>>> +SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16"
>>> +SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
>>> +
>>> +S = "${WORKDIR}/SDL_gfx-${PV}"
>>> +
>>> +inherit autotools pkgconfig
>>> +
>>> +EXTRA_OECONF += " \
>>> +    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \
>>
>> is the intention to have SDL_CONFIG point to pkg-config here
>>
> I was under the impression it replaces sdl-config (sdl-config supports
> for basic stuff as cflags and libs same arguments as pkg-config). Now
> that you ask I checked and grepping did not show my why I should set
> it (it is mentioned in the doc but...).
> So I tested and it builds fine without setting SDL_CONFIG. So V2 is
> near - thanks for the pointer.

I was thinking it should be

SDL_CONFIG="${STAGING_BINDIR_CROSS}/pkg-config sdl"

> 
> Andreas
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Andreas Müller]

On Thu, Oct 4, 2018 at 8:37 AM Khem Raj <raj.khem@gmail.com> wrote:
> >>> +EXTRA_OECONF += " \
> >>> +    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \
> >>
> >> is the intention to have SDL_CONFIG point to pkg-config here
> >>
> > I was under the impression it replaces sdl-config (sdl-config supports
> > for basic stuff as cflags and libs same arguments as pkg-config). Now
> > that you ask I checked and grepping did not show my why I should set
> > it (it is mentioned in the doc but...).
> > So I tested and it builds fine without setting SDL_CONFIG. So V2 is
> > near - thanks for the pointer.
>
> I was thinking it should be
>
> SDL_CONFIG="${STAGING_BINDIR_CROSS}/pkg-config sdl"
>
Sent V2: No need to set SDL_CONFIG - have tested that with master and
I grepped through the code and get the impression it is a leftover not
changing anything.

Andreas

Re: [PATCH 1/8] libsdl-gfx: initial add 2.0.25

[Khem Raj]

Ok, thanks.
On Thu, Oct 4, 2018 at 12:06 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Thu, Oct 4, 2018 at 8:37 AM Khem Raj <raj.khem@gmail.com> wrote:
> > >>> +EXTRA_OECONF += " \
> > >>> +    SDL_CONFIG=${STAGING_BINDIR_CROSS}/pkg-config sdl \
> > >>
> > >> is the intention to have SDL_CONFIG point to pkg-config here
> > >>
> > > I was under the impression it replaces sdl-config (sdl-config supports
> > > for basic stuff as cflags and libs same arguments as pkg-config). Now
> > > that you ask I checked and grepping did not show my why I should set
> > > it (it is mentioned in the doc but...).
> > > So I tested and it builds fine without setting SDL_CONFIG. So V2 is
> > > near - thanks for the pointer.
> >
> > I was thinking it should be
> >
> > SDL_CONFIG="${STAGING_BINDIR_CROSS}/pkg-config sdl"
> >
> Sent V2: No need to set SDL_CONFIG - have tested that with master and
> I grepped through the code and get the impression it is a leftover not
> changing anything.
>
> Andreas

Re: [PATCH 2/8] openjpeg: cmake fixes to prepare update of poppler

[Khem Raj]

Hi Andreas

We applied this patch but its causing regression for mutlilib builds
as reported here

https://github.com/openembedded/meta-openembedded/issues/103

Can you take a look

On Wed, Oct 3, 2018 at 12:25 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * Move *,cmake from ${libdir}/cmake to ${libdir}/cmake/<name-and-version>
>   That is standard location cmake files are installed.
> * Do not export executables - they will not be found in dependant's sysroot
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  ...ke-files-are-installed-at-common-location.patch | 48 ++++++++++++++++++++++
>  ...cmake-to-export-binaries-they-don-t-make-.patch | 31 ++++++++++++++
>  .../recipes-graphics/openjpeg/openjpeg_2.3.0.bb    | 10 ++---
>  3 files changed, 84 insertions(+), 5 deletions(-)
>  create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
>  create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
>
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
> new file mode 100644
> index 000000000..5c5fe64f2
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch
> @@ -0,0 +1,48 @@
> +From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Thu, 27 Sep 2018 23:45:04 +0200
> +Subject: [PATCH] Ensure cmake files are installed at common location
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +* Otherwise recent poppler is not able to find them
> +* Include path needs adjustment with this change
> +
> +Upstream-Status: Inappropriate [Configuration]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + CMakeLists.txt                | 2 +-
> + cmake/OpenJPEGConfig.cmake.in | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index ff70a06f..23d2fac4 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
> +   # We could install *.cmake files in share/ however those files contains
> +   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
> +   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
> +-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
> ++  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
> + endif()
> +
> + if (APPLE)
> +diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
> +index b20294ca..6a2f4baf 100644
> +--- a/cmake/OpenJPEGConfig.cmake.in
> ++++ b/cmake/OpenJPEGConfig.cmake.in
> +@@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
> + if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
> +   # This is an install tree
> +   include(${SELF_DIR}/OpenJPEGTargets.cmake)
> +-  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
> ++  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
> +   set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
> +
> + else()
> +--
> +2.14.4
> +
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
> new file mode 100644
> index 000000000..0ba13cf88
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch
> @@ -0,0 +1,31 @@
> +From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
> +Date: Fri, 28 Sep 2018 00:38:50 +0200
> +Subject: [PATCH] Do not ask cmake to export binaries - they don't make it
> + dependants sysroots
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE-Specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> +---
> + src/bin/jp2/CMakeLists.txt | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
> +index 4324c36d..2c11fe02 100644
> +--- a/src/bin/jp2/CMakeLists.txt
> ++++ b/src/bin/jp2/CMakeLists.txt
> +@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump)
> +   endif()
> +   # Install exe
> +   install(TARGETS ${exe}
> +-    EXPORT OpenJPEGTargets
> +     DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
> +   )
> +   if(OPJ_USE_DSYMUTIL)
> +--
> +2.14.4
> +
> diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
> index d5d06206d..c50d55e4b 100644
> --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
> +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb
> @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
>
>  DEPENDS = "libpng tiff lcms zlib"
>
> -SRC_URI = "git://github.com/uclouvain/openjpeg.git"
> +SRC_URI = " \
> +    git://github.com/uclouvain/openjpeg.git \
> +    file://0001-Ensure-cmake-files-are-installed-at-common-location.patch \
> +    file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
> +"
>  SRCREV = "081de4b15f54cb4482035b7bf5e3fb443e4bc84b"
>  S = "${WORKDIR}/git"
>
>  inherit cmake
> -
> -# standard path for *.cmake
> -EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \
> -                  -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}"
> --
> 2.14.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [PATCH 2/8] openjpeg: cmake fixes to prepare update of poppler

[Andreas Müller]

On Sat, Dec 22, 2018 at 1:16 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> Hi Andreas
>
> We applied this patch but its causing regression for mutlilib builds
> as reported here
>
> https://github.com/openembedded/meta-openembedded/issues/103
>
> Can you take a look
>
Will do

Andreas