diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics')
64 files changed, 1564 insertions, 932 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc index bd66a2820..96aa31117 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc @@ -20,6 +20,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://union-sigval.patch \ file://use-PTHREAD_MUTEX_RECURSIVE.patch \ file://fix-client-gfx_state-initialisation.patch \ + file://fix-tslib-version-check.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch new file mode 100644 index 000000000..352bfaf20 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch @@ -0,0 +1,38 @@ +fix tslib version check in configure.in + +The patch makes sure that the old as well as the new tslib pkg-config +metadata file naming style is handled correctly. + +tslib 0.0 to 1.0 created only a tslib-<VERSION>.pc pkg-config metadata +file. + +With tslib 1.1 the tslib-<VERSION>.pc phase out was started. +Additionally, the pkg-config metadata file tslib.pc was added. + +Since tslib 1.6 the tslib-<VERSION>.pc metadata file is deprecated. +Now, there is only a tslib.pc. + +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Ben Guan <ben.guan@cn.bosch.com> +Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com> + +diff -Nru DirectFB-1.7.7.orig/configure.in DirectFB-1.7.7/configure.in +--- DirectFB-1.7.7.orig/configure.in 2015-02-10 01:16:46.000000000 +0800 ++++ DirectFB-1.7.7/configure.in 2018-06-06 17:19:18.472143103 +0800 +@@ -2459,10 +2459,13 @@ + + enable_tslib=no + if test "$checkfor_tslib" = "yes"; then +- PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no]) ++ PKG_CHECK_MODULES([TSLIB], [tslib >= 1.1], [enable_tslib=yes], [enable_tslib=no]) + if test "$enable_tslib" = "no"; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no +- AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no]) ++ if test "$enable_tslib" = "no"; then ++ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no ++ AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ fi + fi + fi + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb index 481fedf98..947d36eb9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb @@ -45,7 +45,9 @@ EOF cd $currdir } -PACKAGES =+ "${PN}-python-dbg ${PN}-python" +PACKAGES =+ "${PN}-python" + +RPROVIDES_${PN}-dbg += "${PN}-python-dbg" FILES_${PN} += " \ ${datadir}/mime \ @@ -53,7 +55,6 @@ FILES_${PN} += " \ " FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${PN}/python" -FILES_${PN}-python-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" RDEPENDS_${PN}-python = "python" # for e.g kde's oxygen-fonts diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb index 4e2ee2378..7f16708ed 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb @@ -4,9 +4,7 @@ mathematics library for graphics software based on the OpenGL \ Shading Language (GLSL) specifications." HOMEPAGE = "https://glm.g-truc.net" BUGTRACKER = "https://github.com/g-truc/glm/issues" - SECTION = "libs" - LICENSE = "MIT" LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" @@ -16,13 +14,13 @@ SRC_URI = " \ file://0002-glm-install-headers-only.patch \ " SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7" + S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" -FILES_${PN}-dev += "${libdir}/cmake" RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb index 7a691c611..91c5ed211 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.17.bb @@ -16,8 +16,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " -SRC_URI[libgphoto2.md5sum] = "084d220d078d28c0c7a3ba13f4476128" -SRC_URI[libgphoto2.sha256sum] = "e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906" +SRC_URI[libgphoto2.md5sum] = "ae78e7a7936a6962c3a22b256bee1869" +SRC_URI[libgphoto2.sha256sum] = "417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555" inherit autotools pkgconfig gettext lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb new file mode 100644 index 000000000..b077a0bdf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb @@ -0,0 +1,19 @@ +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 += " \ + --disable-mmx \ +" + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch new file mode 100644 index 000000000..5299d378e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch @@ -0,0 +1,43 @@ +Index: SDL_image-1.2.12/configure.in +=================================================================== +--- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 ++++ SDL_image-1.2.12/configure.in 2014-07-18 06:56:56.853466678 +0000 +@@ -1,5 +1,4 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(README) + + dnl Set various version strings - taken gratefully from the GTk sources + +@@ -11,12 +10,19 @@ + # if backwards compatibility has been broken, + # set BINARY_AGE and INTERFACE_AGE to 0. + +-MAJOR_VERSION=1 +-MINOR_VERSION=2 +-MICRO_VERSION=12 ++m4_define([sdlimage_major_version],[1]) ++m4_define([sdlimage_minor_version],[2]) ++m4_define([sdlimage_micro_version],[12]) ++m4_define([sdlimage_version], [sdlimage_major_version.sdlimage_minor_version.sdlimage_micro_version]) ++ ++AC_INIT([SDL_image], [sdlimage_version]) ++ ++MAJOR_VERSION=sdlimage_major_version ++MINOR_VERSION=sdlimage_minor_version ++MICRO_VERSION=sdlimage_micro_version + INTERFACE_AGE=4 + BINARY_AGE=12 +-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION ++VERSION=sdlimage_version + + AC_SUBST(MAJOR_VERSION) + AC_SUBST(MINOR_VERSION) +@@ -42,7 +48,7 @@ + AC_CANONICAL_HOST + + dnl Setup for automake +-AM_INIT_AUTOMAKE(SDL_image, $VERSION) ++AM_INIT_AUTOMAKE([foreign]) + + dnl Check for tools + AC_PROG_LIBTOOL diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb new file mode 100644 index 000000000..ea8e9eaa3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -0,0 +1,32 @@ +SUMMARY = "Simple DirectMedia Layer image library" +SECTION = "libs" + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" + +DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" + +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://configure.patch" +SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" +SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" + +S = "${WORKDIR}/SDL_image-${PV}" + +inherit autotools pkgconfig + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +# Disable the run-time loading of the libs and bring back the soname dependencies. +EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" + +do_configure_prepend() { + # Removing these files fixes a libtool version mismatch. + rm -f ${S}/acinclude/libtool.m4 + rm -f ${S}/acinclude/sdl.m4 + rm -f ${S}/acinclude/pkg.m4 + rm -f ${S}/acinclude/lt~obsolete.m4 + rm -f ${S}/acinclude/ltoptions.m4 + rm -f ${S}/acinclude/ltsugar.m4 + rm -f ${S}/acinclude/ltversion.m4 +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch new file mode 100644 index 000000000..4c9e8d094 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch @@ -0,0 +1,21 @@ +diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in +--- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 ++++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 +@@ -1,6 +1,5 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(README) +-AC_CONFIG_AUX_DIR(build-scripts) + + dnl Set various version strings - taken gratefully from the GTk sources + +@@ -40,10 +39,6 @@ + AC_SUBST(LT_REVISION) + AC_SUBST(LT_AGE) + +-dnl Detect the canonical build and host environments +-AC_CONFIG_AUX_DIRS($srcdir/build-scripts) +-dnl AC_CANONICAL_HOST +- + dnl Check for tools + AC_PROG_LIBTOOL + AC_PROG_CC diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb new file mode 100644 index 000000000..c83fcc8da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb @@ -0,0 +1,39 @@ +SUMMARY = "Simple DirectMedia Layer mixer library" +SECTION = "libs" +DEPENDS = "virtual/libsdl flac libmikmod libvorbis" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" + +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ + file://configure.patch \ +" + +SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" +SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" + +S = "${WORKDIR}/SDL_mixer-${PV}" + +inherit autotools-brokensep pkgconfig + +EXTRA_AUTORECONF += "--include=acinclude" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" + +PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" + +do_configure () { + # Remove old libtool macros. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f acinclude/$i + done + cp build-scripts/* . || true + rm -rf build-scripts/ + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR + + autotools_do_configure + + rm config.log + for i in $(find -name "Makefile") ; do + sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i + done +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch new file mode 100644 index 000000000..fb3ff7e68 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch @@ -0,0 +1,11 @@ +diff -Nurd SDL_net-1.2.8/Makefile.am SDL_net-1.2.8/Makefile.am +--- SDL_net-1.2.8/Makefile.am 2012-01-15 18:20:10.000000000 +0200 ++++ SDL_net-1.2.8/Makefile.am 2014-08-01 21:18:52.720815807 +0300 +@@ -1,5 +1,7 @@ + # Makefile.am for the SDL sample image loading library and viewer + ++AUTOMAKE_OPTIONS = foreign ++ + lib_LTLIBRARIES = libSDL_net.la + + libSDL_netincludedir = $(includedir)/SDL diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch new file mode 100644 index 000000000..9718a3b94 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch @@ -0,0 +1,21 @@ +From f9417c864183a0f6d0e90f66f5254a63b04a041a Mon Sep 17 00:00:00 2001 +From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> +Date: Wed, 17 Oct 2012 20:51:51 +0200 + +--- + configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.in b/configure.in +index c42bd0c..71a4825 100644 +--- a/configure.in ++++ b/configure.in +@@ -44,6 +44,8 @@ AC_CANONICAL_HOST + dnl Setup for automake + AM_INIT_AUTOMAKE(SDL_net, $VERSION) + ++dnl got macros ++AC_CONFIG_MACRO_DIR([acinclude]) + dnl Check for tools + AC_PROG_LIBTOOL + AC_PROG_CC diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb new file mode 100644 index 000000000..b021e565e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Simple DirectMedia Layer networking library." +SECTION = "libs/network" + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=9cf3de2d872bf510f88eb20d06d700b5" + +inherit autotools pkgconfig + +DEPENDS = "virtual/libsdl" + +SRC_URI = " \ + https://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \ + file://libtool2.patch \ + file://am_foreign.patch \ +" + +S = "${WORKDIR}/SDL_net-${PV}" + +SRC_URI[md5sum] = "20e64e61d65662db66c379034f11f718" +SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch new file mode 100644 index 000000000..1116c34d0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch @@ -0,0 +1,62 @@ +From 8cf318197eea91bec6057308befbb29426d69014 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 22 May 2014 10:59:33 +0100 +Subject: [PATCH] freetype-config was removed from oe-core in + +commit 5870bd272b0b077d0826fb900b251884c1c05061 + + binconfig-disabled: Add class and use + +--- + configure.in | 38 +++++--------------------------------- + 1 file changed, 5 insertions(+), 33 deletions(-) + +diff --git a/configure.in b/configure.in +index 865075e..d7a5a81 100644 +--- a/configure.in ++++ b/configure.in +@@ -90,39 +90,11 @@ case "$host" in + esac + AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) + +-dnl Check for the FreeType 2 library +-dnl +-dnl Get the cflags and libraries from the freetype-config script +-dnl +-AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is +-installed (optional)], +- freetype_prefix="$withval", freetype_prefix="") +-AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix +-where FREETYPE is installed (optional)], +- freetype_exec_prefix="$withval", freetype_exec_prefix="") +- +-if test x$freetype_exec_prefix != x ; then +- freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config +- fi +-fi +-if test x$freetype_prefix != x ; then +- freetype_args="$freetype_args --prefix=$freetype_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config +- fi +-fi +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-no_freetype="" +-if test "$FREETYPE_CONFIG" = "no" ; then +- AC_MSG_ERROR([ +-*** Unable to find FreeType2 library (http://www.freetype.org/) +-]) +-else +- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" +- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" +-fi ++PKG_CHECK_MODULES(FREETYPE2, freetype2, ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS", ++ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) ++) + + dnl Check for SDL + SDL_VERSION=1.2.4 diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb new file mode 100644 index 000000000..d8b378f2c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb @@ -0,0 +1,29 @@ +SUMMARY = "Simple DirectMedia Layer truetype font library" +SECTION = "libs" +DEPENDS = "virtual/libsdl freetype" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303" + +SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ + file://use.pkg-config.for.freetype2.patch \ +" +SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa" +SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" + +S = "${WORKDIR}/SDL_ttf-${PV}" + +inherit autotools pkgconfig + +LDFLAGS += "-lm" + +do_configure_prepend() { + # make autoreconf happy + touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog + + # Removing these files fixes a libtool version mismatch. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + + for i in ${MACROS}; do + rm -f ${S}/acinclude/$i + done +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.3.bb new file mode 100644 index 000000000..6deb352e6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Simple DirectMedia Layer image library v2" +SECTION = "libs" + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=a855a9eb5507fc556e672080c4b428ca" + +DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" + +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" +SRC_URI[md5sum] = "c6baf6dfa80fa8a66853661a36a6034e" +SRC_URI[sha256sum] = "3510c25da735ffcd8ce3b65073150ff4f7f9493b866e85b83738083b556d2368" + +S = "${WORKDIR}/SDL2_image-${PV}" + +inherit autotools pkgconfig + +# Disable the run-time loading of the libs and bring back the soname dependencies. +EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" + +do_configure_prepend() { + # make autoreconf happy + touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog + # Removing these files fixes a libtool version mismatch. + rm -f ${S}/acinclude/libtool.m4 + rm -f ${S}/acinclude/sdl2.m4 + rm -f ${S}/acinclude/pkg.m4 + rm -f ${S}/acinclude/lt~obsolete.m4 + rm -f ${S}/acinclude/ltoptions.m4 + rm -f ${S}/acinclude/ltsugar.m4 + rm -f ${S}/acinclude/ltversion.m4 +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.2.bb new file mode 100644 index 000000000..718f3f5fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "Simple DirectMedia Layer mixer library V2" +SECTION = "libs" +DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5" + +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" + +SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c" +SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb" + +S = "${WORKDIR}/SDL2_mixer-${PV}" + +inherit autotools-brokensep pkgconfig + +EXTRA_AUTORECONF += "--include=acinclude" +EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" + +PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" + +do_configure_prepend () { + # Remove old libtool macros. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + for i in ${MACROS}; do + rm -f acinclude/$i + done +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb new file mode 100644 index 000000000..0ea96fe1b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Simple DirectMedia Layer networking library." +SECTION = "libs/network" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fe9d52a78585a65224776875510ed127" + +SRC_URI = " \ + https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \ +" +S = "${WORKDIR}/SDL2_net-${PV}" + +inherit autotools pkgconfig + +DEPENDS = "virtual/libsdl2" + +SRC_URI[md5sum] = "5c1d9d1cfa63301b141cb5c0de2ea7c4" +SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21" + +do_configure_prepend() { + # create dummy files which autotools consider as mandatory + touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog + + # Remove old libtool macros. + for macro in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do + echo ${S}/acinclude/macro + rm -f ${S}/acinclude/$macro + done +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch new file mode 100644 index 000000000..871e6e94e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch @@ -0,0 +1,21 @@ +From f9c4ad3a171d676e3818b8f6897f325ccf0b2203 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 9 May 2017 00:57:10 -0700 + +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index 8166d91..8e05e49 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,6 +2,8 @@ + + lib_LTLIBRARIES = libSDL2_ttf.la + ++AUTOMAKE_OPTIONS = foreign ++ + libSDL2_ttfincludedir = $(includedir)/SDL2 + libSDL2_ttfinclude_HEADERS = \ + SDL_ttf.h diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch new file mode 100644 index 000000000..1dfbec6ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/use.pkg-config.for.freetype2.patch @@ -0,0 +1,62 @@ +From e6d2c0e130811c15b5f5cc10221fae182cb8609e Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 22 May 2014 10:59:33 +0100 +Subject: [PATCH] freetype-config was removed from oe-core in + +commit 5870bd272b0b077d0826fb900b251884c1c05061 + + binconfig-disabled: Add class and use + +--- + configure.in | 38 +++++--------------------------------- + 1 file changed, 5 insertions(+), 33 deletions(-) + +diff --git a/configure.in b/configure.in +index 9b36e15..f300cae 100644 +--- a/configure.in ++++ b/configure.in +@@ -86,39 +86,11 @@ case "$host" in + esac + AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue) + +-dnl Check for the FreeType 2 library +-dnl +-dnl Get the cflags and libraries from the freetype-config script +-dnl +-AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is +-installed (optional)], +- freetype_prefix="$withval", freetype_prefix="") +-AC_ARG_WITH(freetype-exec-prefix,[ --with-freetype-exec-prefix=PFX Exec prefix +-where FREETYPE is installed (optional)], +- freetype_exec_prefix="$withval", freetype_exec_prefix="") +- +-if test x$freetype_exec_prefix != x ; then +- freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config +- fi +-fi +-if test x$freetype_prefix != x ; then +- freetype_args="$freetype_args --prefix=$freetype_prefix" +- if test x${FREETYPE_CONFIG+set} != xset ; then +- FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config +- fi +-fi +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-no_freetype="" +-if test "$FREETYPE_CONFIG" = "no" ; then +- AC_MSG_ERROR([ +-*** Unable to find FreeType2 library (http://www.freetype.org/) +-]) +-else +- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" +- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" +-fi ++PKG_CHECK_MODULES(FREETYPE2, freetype2, ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS", ++ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) ++) + + dnl Check for SDL + SDL_VERSION=2.0.0 diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb new file mode 100644 index 000000000..4601593ad --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb @@ -0,0 +1,30 @@ +SUMMARY = "Simple DirectMedia Layer truetype font library" +SECTION = "libs" +DEPENDS = "virtual/libsdl2 freetype virtual/libgl" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=cb33e7c4df9fbde389f149ad6bc93ce5" + +SRC_URI = " \ + http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz \ + file://use.pkg-config.for.freetype2.patch \ + file://automake_foreign.patch \ +" +SRC_URI[md5sum] = "e53c05e1e7f1382c316afd6c763388b1" +SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276" + +S = "${WORKDIR}/SDL2_ttf-${PV}" + +inherit autotools pkgconfig distro_features_check + +# links to libGL.so +REQUIRED_DISTRO_FEATURES += "x11 opengl" + +do_configure_prepend() { + # Removing these files fixes a libtool version mismatch. + MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" + + for i in ${MACROS}; do + rm -f ${S}/acinclude/$i + done +} +ASNEEDED = "" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch new file mode 100644 index 000000000..6d4bdc2ab --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch @@ -0,0 +1,147 @@ +From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Sep 2018 18:21:19 -0700 +Subject: [PATCH 1/2] Use override consistently + +Make clang++ happy +error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride] + +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/NCApplication.h | 46 ++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/NCApplication.h b/src/NCApplication.h +index e24c3eb..09e4708 100644 +--- a/src/NCApplication.h ++++ b/src/NCApplication.h +@@ -60,7 +60,7 @@ public: + * Reimplemented from YApplication. + **/ + virtual void setLanguage( const std::string & language, +- const std::string & encoding = std::string() ); ++ const std::string & encoding = std::string() ) override; + + /** + * Open a directory selection box and prompt the user for an existing +@@ -77,7 +77,7 @@ public: + * Implemented from YApplication. + **/ + virtual std::string askForExistingDirectory( const std::string & startDir, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Open a file selection box and prompt the user for an existing file. +@@ -97,7 +97,7 @@ public: + **/ + virtual std::string askForExistingFile( const std::string & startWith, + const std::string & filter, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Open a file selection box and prompt the user for a file to save data +@@ -119,28 +119,28 @@ public: + **/ + virtual std::string askForSaveFileName( const std::string & startWith, + const std::string & filter, +- const std::string & headline ); ++ const std::string & headline ) override; + + /** + * Beep. + * + * Reimplemented from YApplication. + **/ +- virtual void beep(); ++ virtual void beep() override; + + /** + * Redraw the screen. + * + * Reimplemented from YApplication. + **/ +- virtual void redrawScreen(); ++ virtual void redrawScreen() override; + + /** + * Initialize the (text) console keyboard. + * + * Reimplemented from YApplication. + **/ +- virtual void initConsoleKeyboard(); ++ virtual void initConsoleKeyboard() override; + + /** + * Set the (text) console font according to the current encoding etc. +@@ -152,7 +152,7 @@ public: + const std::string & font, + const std::string & screen_map, + const std::string & unicode_map, +- const std::string & language ); ++ const std::string & language ) override; + + /** + * Run a shell command (typically an interactive program using NCurses) +@@ -165,7 +165,7 @@ public: + * + * Reimplemented from YApplication. + **/ +- virtual int runInTerminal( const std::string & command ); ++ virtual int runInTerminal( const std::string & command ) override; + + + /// @{ +@@ -183,33 +183,33 @@ public: + // + // All implemented from YApplication. + +- virtual int displayWidth(); +- virtual int displayHeight(); +- virtual int displayDepth(); +- virtual long displayColors(); ++ virtual int displayWidth() override; ++ virtual int displayHeight() override; ++ virtual int displayDepth() override; ++ virtual long displayColors() override; + +- virtual int defaultWidth(); +- virtual int defaultHeight(); ++ virtual int defaultWidth() override; ++ virtual int defaultHeight() override; + +- virtual bool isTextMode() { return true; } ++ virtual bool isTextMode() override { return true; } + +- virtual bool hasImageSupport() { return false; } ++ virtual bool hasImageSupport() override { return false; } + +- virtual bool hasIconSupport() { return false; } ++ virtual bool hasIconSupport() override { return false; } + +- virtual bool hasAnimationSupport() { return false; } ++ virtual bool hasAnimationSupport() override { return false; } + +- virtual bool hasFullUtf8Support(); +- virtual bool richTextSupportsTable() { return false; } ++ virtual bool hasFullUtf8Support() override; ++ virtual bool richTextSupportsTable() override { return false; } + +- virtual bool leftHandedMouse() { return false; } ++ virtual bool leftHandedMouse() override { return false; } + + /** + * Set the application title + * + * Reimplemented from YApplication. + **/ +- virtual void setApplicationTitle(const std::string& title); ++ virtual void setApplicationTitle(const std::string& title) override; + }; + + +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch deleted file mode 100644 index 8e3774c1a..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 4 Mar 2018 17:08:43 -0800 -Subject: [PATCH] use _nl_msg_cat_cntr only with glibc - -The musl libc provides libintl (similar to glibc) -but does not use the same internals, -so even though we are using the GNU gettext -the libintl included with the libc does not define -_nl_msg_cat_cntr and it does not need to. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/NCi18n.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/NCi18n.h b/src/NCi18n.h -index 165b0e7..bfc4ed7 100644 ---- a/src/NCi18n.h -+++ b/src/NCi18n.h -@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain ) - bindtextdomain( domain, YSettings::localeDir().c_str() ); - bind_textdomain_codeset( domain, "UTF-8" ); - textdomain( domain ); -- -+#if defined(__GLIBC__) - // Make change known - { - extern int _nl_msg_cat_cntr; - ++_nl_msg_cat_cntr; - } -+#endif - } - - --- -2.16.2 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch new file mode 100644 index 000000000..f65cbe667 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch @@ -0,0 +1,49 @@ +From 162a0899f1dacd83007c4e82b9034f55610d8c20 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Sep 2018 19:01:51 -0700 +Subject: [PATCH 2/2] Define own resize in NCPad and fix param type of + SetLabel() + +Explicitly override resize() to avoid conflicts from NCursesWindow +definition since there is another resize definition as well + +Fixes +src/NCPad.h:164:18: error: 'NCPad::resize' hides overloaded virtual function [-Werror,-Woverloaded-virtual] + +NCTablePad.h:132:18: error: 'NCTableTag::SetLabel' hides overloaded virtual function [-Werror,-Woverloaded-virtual] + +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/NCPad.h | 1 + + src/NCTablePad.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/NCPad.h b/src/NCPad.h +index 328c4aa..d8fb324 100644 +--- a/src/NCPad.h ++++ b/src/NCPad.h +@@ -162,6 +162,7 @@ public: + virtual void Destwin( NCursesWindow * dwin ); + + virtual void resize( wsze nsze ); ++ virtual int resize( int lines, int columns ) { return NCursesWindow::resize(lines, columns );} + virtual void wRecoded(); + virtual void setDirty() { dirty = true; } + +diff --git a/src/NCTablePad.h b/src/NCTablePad.h +index c450529..3756796 100644 +--- a/src/NCTablePad.h ++++ b/src/NCTablePad.h +@@ -129,7 +129,7 @@ public: + + virtual ~NCTableTag() {} + +- virtual void SetLabel( const NCstring & ) { /*NOOP*/; } ++ virtual void SetLabel( const NClabel & ) { /*NOOP*/; } + + virtual void DrawAt( NCursesWindow & w, const wrect at, + NCTableStyle & tableStyle, +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch new file mode 100644 index 000000000..2520ac46f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch @@ -0,0 +1,35 @@ +From c2291fe28dc5682f81804941512431642975cf21 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@siemens.com> +Date: Mon, 29 Oct 2018 18:17:32 +0100 +Subject: [PATCH] Simplify ncurses finding module + +CMake will automatically look in the right locations, there is no need to +re-implement the logic with a for loop and NO_DEFAULT_PATH. + +It is already done like this to file the headers. + +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/73] +Signed-off-by: Pascal Bach <pascal.bach@siemens.com> +--- + cmake/Modules/FindCurses6.cmake | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/cmake/Modules/FindCurses6.cmake b/cmake/Modules/FindCurses6.cmake +index 0bf02c3..e298d5d 100644 +--- a/cmake/Modules/FindCurses6.cmake ++++ b/cmake/Modules/FindCurses6.cmake +@@ -5,11 +5,9 @@ + # CURSES6_LIBRARIES - The libraries needed to use Curses6 + # CURSES6_DEFINITIONS - Compiler switches required for using Curses6 + +-FOREACH(path ${CMAKE_LIBRARY_PATH} /usr/${LIB_DIR}) +- FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +- FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +- FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +-ENDFOREACH() ++FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATH_SUFFIXES ncurses6) ++FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATH_SUFFIXES ncurses6) ++FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATH_SUFFIXES ncurses6) + + SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY}) + # tinfo is optional (in 12.1 is not there) diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index 578c71301..18ea2e828 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -5,13 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \ + file://0001-Use-override-consistently.patch \ + file://0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch \ + file://0003-Simplify-ncurses-finding-module.patch \ " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" PV = "2.48.3+git${SRCPV}" -SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" +SRCREV = "c941b32246e8b2952fce4fd5743f8e318222ab98" S = "${WORKDIR}/git" @@ -29,8 +31,8 @@ do_configure_prepend () { mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ cd - - sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake + sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake } do_install_append () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch deleted file mode 100644 index c1ba42eee..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1e6d40fec16a94d1a4bd40634405267200b7e969 Mon Sep 17 00:00:00 2001 -From: marxin <mliska@suse.cz> -Date: Tue, 10 Apr 2018 15:21:40 +0200 -Subject: [PATCH] Fix GCC 8 warning: -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static void YDialog::showText(const string&, bool)’: -/home/marxin/Programming/libyui/src/YDialog.cc:690:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] - catch ( YUIException exception ) - ^~~~~~~~~ -/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static bool YDialog::showRelNotesText()’: -/home/marxin/Programming/libyui/src/YDialog.cc:814:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=] - catch ( YUIException exception ) - ^~~~~~~~~ ---- -Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/122] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - src/YDialog.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/YDialog.cc b/src/YDialog.cc -index 92e5031..8ecff90 100644 ---- a/src/YDialog.cc -+++ b/src/YDialog.cc -@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText ) - dialog->waitForEvent(); - dialog->destroy(); - } -- catch ( YUIException exception ) -+ catch ( YUIException &exception ) - { - // Don't let the application die just because help couldn't be displayed. - -@@ -811,7 +811,7 @@ YDialog::showRelNotesText() - } - dialog->destroy(); - } -- catch ( YUIException exception ) -+ catch ( YUIException &exception ) - { - // Don't let the application die just because RN couldn't be displayed. - --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch new file mode 100644 index 000000000..dbe241709 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch @@ -0,0 +1,32 @@ +From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Sep 2018 17:48:09 -0700 +Subject: [PATCH] Use curly braces for MAKE variable + +Fixes errors with ninja +| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$) + +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + buildtools/LibyuiCommon.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake +index cb93307..e6fbefd 100644 +--- a/buildtools/LibyuiCommon.cmake ++++ b/buildtools/LibyuiCommon.cmake +@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE + ENABLE_TESTING() + # add a wrapper "tests" target, the builtin "test" cannot be extended :-( + ADD_CUSTOM_TARGET(tests +- $(MAKE) +- COMMAND $(MAKE) test ++ ${MAKE} ++ COMMAND ${MAKE} test + ) + ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE) + +-- +2.18.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch new file mode 100644 index 000000000..11a1678a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Use-relative-install-paths-for-CMake.patch @@ -0,0 +1,130 @@ +From d24c2516ae25d0ee180c1020e52114ea32230585 Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@siemens.com> +Date: Mon, 29 Oct 2018 18:03:43 +0100 +Subject: [PATCH] Use relative install paths for CMake + +Files are installed via a special _PREFIX variant of the INSTALL_???_DIR +variable which is an absolute path. + +This not only is redundant if CMAKE_INTALL_PREFIX is set but it even causes +the resulting Config.cmake to be non relocatable. This means it contains absolute +paths to the build host. This is a problem for cross compilation in Yocto. + +This change gets rid of the absolute path and removes the no longer needed +_PREFIX variants. + +Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/140] +Signed-off-by: Pascal Bach <pascal.bach@siemens.com> +--- + buildtools/LibyuiCommon.cmake | 35 ++++++++++++++--------------------- + 1 file changed, 14 insertions(+), 21 deletions(-) + +diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake +index e6fbefd..5e2fc0d 100644 +--- a/buildtools/LibyuiCommon.cmake ++++ b/buildtools/LibyuiCommon.cmake +@@ -258,13 +258,6 @@ MACRO( SET_ENVIRONMENT ) # setup the environment vars + + SET( INSTALL_DOC_DIR "${DOC_DIR}" ) + +- FOREACH( p "DOC" LIB INCLUDE CMAKE PKGCONFIG BUILDTOOLS ) +- SET( var "INSTALL_${p}_DIR" ) +- IF( NOT IS_ABSOLUTE "${${var}}" ) +- SET( ${var}_PREFIX "${YPREFIX}/${${var}}" ) +- ENDIF( NOT IS_ABSOLUTE "${${var}}" ) +- ENDFOREACH() +- + ENDMACRO( SET_ENVIRONMENT ) + + MACRO( SET_SONAME ) +@@ -359,7 +352,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc + IF( INSTALL_DOCS OR DOCS_ONLY ) + INSTALL( + FILES "${CMAKE_BINARY_DIR}/doc/latex/refman.pdf" +- DESTINATION "${INSTALL_DOC_DIR_PREFIX}" ++ DESTINATION "${INSTALL_DOC_DIR}" + ) + ENDIF( INSTALL_DOCS OR DOCS_ONLY ) + +@@ -379,7 +372,7 @@ MACRO( SET_AUTODOCS ) # looks for doxygen, dot and latex and setup autodocs acc + FOREACH( p css gif html jpg js png tag ) + INSTALL( + DIRECTORY "${CMAKE_BINARY_DIR}/doc/html" +- DESTINATION "${INSTALL_DOC_DIR_PREFIX}" ++ DESTINATION "${INSTALL_DOC_DIR}" + FILES_MATCHING PATTERN "*.${p}" + ) + ENDFOREACH() +@@ -638,32 +631,32 @@ MACRO( SET_INSTALL_TARGET ) + + INSTALL( + EXPORT ${PROJECTNAME_UC}LibraryDepends +- DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}" ++ DESTINATION "${INSTALL_CMAKE_DIR}" + COMPONENT dev + ) + + FOREACH( p Config.cmake ConfigVersion.cmake ) + INSTALL( + FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME_UC}${p}" +- DESTINATION "${INSTALL_CMAKE_DIR_PREFIX}" ++ DESTINATION "${INSTALL_CMAKE_DIR}" + ) + ENDFOREACH( p Config.cmake ConfigVersion.cmake ) + + INSTALL( + FILES "${CMAKE_BINARY_DIR}/${PROJECTNAME}.pc" +- DESTINATION "${INSTALL_PKGCONFIG_DIR_PREFIX}" ++ DESTINATION "${INSTALL_PKGCONFIG_DIR}" + ) + + IF( NOT PLUGINNAME AND NOT EXTENSIONNAME ) + INSTALL( + DIRECTORY "${BUILDTOOLS_DIR}" +- DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}" ++ DESTINATION "${INSTALL_BUILDTOOLS_DIR}" + ) + ENDIF( NOT PLUGINNAME AND NOT EXTENSIONNAME ) + + INSTALL( + FILES ${BUILDTOOLS_LIST} +- DESTINATION "${INSTALL_BUILDTOOLS_DIR_PREFIX}" ++ DESTINATION "${INSTALL_BUILDTOOLS_DIR}" + ) + + ENDMACRO( SET_INSTALL_TARGET ) +@@ -724,9 +717,9 @@ MACRO( PROCESS_SOURCES ) + INSTALL( + TARGETS ${TARGETLIB} + EXPORT ${PROJECTNAME_UC}LibraryDepends +- LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}" +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}" +- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}" ++ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ++ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" ++ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev + ) + +@@ -746,9 +739,9 @@ MACRO( PROCESS_SOURCES ) + INSTALL( + TARGETS ${TARGETLIB}_static + EXPORT ${PROJECTNAME_UC}LibraryDepends +- LIBRARY DESTINATION "${INSTALL_LIB_DIR_PREFIX}" +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_PREFIX}" +- PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR_PREFIX}" ++ LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ++ ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" ++ PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev + ) + +@@ -776,7 +769,7 @@ MACRO( PROCESS_EXAMPLES ) + + INSTALL( + FILES ${EXAMPLES_LIST} +- DESTINATION "${INSTALL_DOC_DIR_PREFIX}/examples" ++ DESTINATION "${INSTALL_DOC_DIR}/examples" + ) + + ENDMACRO( PROCESS_EXAMPLES ) diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb index 42945288c..d313fb02d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ " SRC_URI = "git://github.com/libyui/libyui.git \ - file://0001-Fix-GCC-8-warning.patch \ file://0001-Fix-build-with-clang.patch \ + file://0001-Use-curly-braces-for-MAKE-variable.patch \ + file://0001-Use-relative-install-paths-for-CMake.patch \ " PV = "3.3.3+git" -SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" - +SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c" +SRCREV_FORMAT = "default" S = "${WORKDIR}/git" inherit cmake gettext pkgconfig @@ -22,9 +23,9 @@ DEPENDS += "boost" BBCLASSEXTEND = "native nativesdk" do_configure_prepend () { - cd ${S} - ./bootstrap.sh - cd - + (cd ${S} && + ./bootstrap.sh && + cd -) } do_install_append () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch index f9fd4970f..f9fd4970f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch new file mode 100644 index 000000000..afe11f353 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch @@ -0,0 +1,27 @@ +From 72812894cfd9454d70e4b0753531e46580416771 Mon Sep 17 00:00:00 2001 +From: dgod <dgod.osa@gmail.com> +Date: Mon, 21 Mar 2016 19:25:25 +0800 +Subject: [PATCH] fix css under gtk 3.20 + +Upstream-Status: Applied [1] + +[1] https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771 +--- + data/themes/Industrial/gtk.css | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css +index 179f0d6..f8e6432 100644 +--- a/data/themes/Industrial/gtk.css ++++ b/data/themes/Industrial/gtk.css +@@ -17,6 +17,7 @@ + color: #000000; + } + ++#bottom_pane label, + #bottom_pane GtkLabel { + font: Sans 12; + color: #9E9D9B; +-- +2.14.4 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 8e7efcdad..701266bcc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -7,14 +7,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar. ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ file://0002-let-autotools-create-lxdm.conf.patch \ - file://0001-check-for-libexecinfo-providing-backtrace-APIs.patch \ + file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \ + file://0004-fix-css-under-gtk-3.20.patch \ " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" PE = "1" -DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" +DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3 virtual/libx11 libxcb pango iso-codes" DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" DEPENDS_append_libc-musl = " libexecinfo" @@ -28,7 +29,7 @@ REQUIRED_DISTRO_FEATURES = "x11" CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " LDFLAGS_append_libc-musl = " -lexecinfo" -EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ +EXTRA_OECONF += "--enable-gtk3=yes --enable-password=yes --with-x -with-xconn=xcb \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index c35a0c723..f4d21b8f9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -39,7 +39,6 @@ python populate_packages_prepend() { do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) } -RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks" FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" FILES_${PN}-lxde += "${datadir}/lxde/ \ @@ -54,3 +53,5 @@ FILES_${PN}-gnome += " \ " FILES_${PN}-config += "${sysconfdir}" + +RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python pyxdg" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch deleted file mode 100644 index 866d9aa41..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 226f07e4b49c2757b181c62e6841000c512054e3 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Mon, 14 Aug 2017 17:26:58 +0200 -Subject: [PATCH] bmp_read_info_header(): reject bmp files with biBitCount == 0 - (#983) - -Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/baf0c1ad4572daa89caa3b12985bdd93530f0dd7] -CVE: CVE-2017-12982 -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - src/bin/jp2/convertbmp.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/bin/jp2/convertbmp.c b/src/bin/jp2/convertbmp.c -index b49e7a0..2715fdf 100644 ---- a/src/bin/jp2/convertbmp.c -+++ b/src/bin/jp2/convertbmp.c -@@ -392,6 +392,10 @@ static OPJ_BOOL bmp_read_info_header(FILE* IN, OPJ_BITMAPINFOHEADER* header) - - header->biBitCount = (OPJ_UINT16)getc(IN); - header->biBitCount |= (OPJ_UINT16)((OPJ_UINT32)getc(IN) << 8); -+ if (header->biBitCount == 0) { -+ fprintf(stderr, "Error, invalid biBitCount %d\n", 0); -+ return OPJ_FALSE; -+ } - - if (header->biSize >= 40U) { - header->biCompression = (OPJ_UINT32)getc(IN); --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Ensure-cmake-files-are-installed-at-common-location.patch b/meta-openembedded/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-openembedded/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-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-openembedded/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-openembedded/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-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb deleted file mode 100644 index 4ef1c408f..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" -HOMEPAGE = "http://www.openjpeg.org" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" - -SRC_URI = "https://github.com/uclouvain/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ - file://0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch \ - " -SRC_URI[md5sum] = "269bb0b175476f3addcc0d03bd9a97b6" -SRC_URI[sha256sum] = "6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b" - -inherit cmake - -DEPENDS = "libpng tiff lcms zlib" - -# standard path for *.cmake -EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_PACKAGE_DIR=${baselib}/cmake \ - -DOPENJPEG_INSTALL_LIB_DIR:PATH=${libdir}" - -FILES_${PN}-dev += "${libdir}/cmake/*.cmake" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb new file mode 100644 index 000000000..c50d55e4b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "OpenJPEG library is an open-source JPEG 2000 codec" +HOMEPAGE = "http://www.openjpeg.org" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" + +DEPENDS = "libpng tiff lcms zlib" + +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 diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch index 12c437629..f0056d656 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch @@ -1,6 +1,6 @@ -From 4b423cd2e5e4296abca3be553bf64d8cc287180a Mon Sep 17 00:00:00 2001 +From 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 20 Jul 2017 17:09:05 +0800 +Date: Tue, 31 Jul 2018 16:39:52 +0800 Subject: [PATCH 1/4] tigervnc: remove includedir Upstream-Status: Pending @@ -15,28 +15,28 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am -index 0d6a4ac..854f078 100644 +index 470424b..ee18bf9 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am -@@ -22,7 +22,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ +@@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ - libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ - -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ + -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ -I$(top_srcdir)/include bin_PROGRAMS = Xvnc -@@ -42,7 +42,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ +@@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ -UHAVE_CONFIG_H \ -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \ - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -@@ -62,7 +62,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ +@@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ -I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/include \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch deleted file mode 100644 index 2f342c683..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4ec992984983ac9107efae1f1cc552007e4229e Mon Sep 17 00:00:00 2001 -From: Vishal Biswas <vshlbiswas@ymail.com> -Date: Mon, 8 May 2017 11:06:11 +0530 -Subject: [PATCH] Remove INITARGS from xserver119.patch - -Upstream-Status: Backport - ---- - unix/xserver119.patch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unix/xserver119.patch b/unix/xserver119.patch -index 614f104..7adf314 100644 ---- a/unix/xserver119.patch -+++ b/unix/xserver119.patch -@@ -66,7 +66,7 @@ diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c - #include "globals.h" - - +#ifdef TIGERVNC --+extern void vncExtensionInit(INITARGS); -++extern void vncExtensionInit(void); - +#endif - + - /* The following is only a small first step towards run-time --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb index 469745f2a..f3dc89972 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb @@ -15,23 +15,22 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit autotools cmake B = "${S}" -SRCREV = "4d6e1b8306a8cca8ad5e15ff8201f6ea24459cfd" +SRCREV = "6f2301d08e64a965ad36b401ec8dc2b24bc47075" -SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.8-branch \ +SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.9-branch \ file://0001-tigervnc-remove-includedir.patch \ file://0002-do-not-build-tests-sub-directory.patch \ file://0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch \ file://0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch \ - file://0005-Remove-INITARGS-from-xserver119.patch.patch \ " # Keep sync with xorg-server in oe-core XORG_PN ?= "xorg-server" -XORG_PV ?= "1.19.3" +XORG_PV ?= "1.19.6" SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" -SRC_URI[xorg.md5sum] = "015d2fc4b9f2bfe7a626edb63a62c65e" -SRC_URI[xorg.sha256sum] = "677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98" +SRC_URI[xorg.md5sum] = "3e47777ff034a331aed2322b078694a8" +SRC_URI[xorg.sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" # It is the directory containing the Xorg source for the # machine on which you are building TigerVNC. diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb index 7ae941a3c..8d23bd5eb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.16.bb @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. file://ts.conf \ file://tslib.sh \ " -SRC_URI[md5sum] = "9ff36788c9ab76a10b58422227b9629e" -SRC_URI[sha256sum] = "7ce48807cab655076d71a1ceef3ed0ab8a25df98074981d4a8fd1477ee5f710c" +SRC_URI[md5sum] = "254a022fc8aa89d164840fe8869c2441" +SRC_URI[sha256sum] = "c9a54651337a701a66b074c603c313225579995a7910e519bbc7b1dcdab9a755" UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb index 31bcce066..b79a562c8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Video Decode and Presentation API for UNIX" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" -DEPENDS = "virtual/libx11 libxext dri2proto" +DEPENDS = "virtual/libx11 libxext xorgproto" PV = "1.1.1+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb index f40dec884..62296b5be 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb @@ -11,6 +11,6 @@ BBCLASSEXTEND = "native" DEPENDS += "libice" -SRC_URI[md5sum] = "25dab02f8e40d5b71ce29a07dc901b8c" -SRC_URI[sha256sum] = "1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a" +SRC_URI[md5sum] = "3b9b79fa0f9928161f4bad94273de7ae" +SRC_URI[sha256sum] = "e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb index a6fc9e755..b42c1b950 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb @@ -5,7 +5,7 @@ events and executes requested commands if they occur. " LIC_FILES_CHKSUM = "file://COPYING;md5=208668fa9004709ba22c2b748140956c" -DEPENDS += "libxkbfile" +DEPENDS += "libxkbfile bison-native" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb index 85957e056..e50c082d8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" DEPENDS += "libxmu" -SRC_URI[md5sum] = "b54c7e3e53b4f332d41ed435433fbda0" -SRC_URI[sha256sum] = "73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b" +SRC_URI[md5sum] = "96f9423eab4d0641c70848d665737d2e" +SRC_URI[sha256sum] = "2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb index 16f9b7882..c2feb8107 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb @@ -1,6 +1,6 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xproto xextproto libxext libxau libxinerama libxpm ncurses" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=f02ab9ebda87b770ecf711dbb3784a33" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb new file mode 100644 index 000000000..b436ef1e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-armsoc_1.4.1.bb @@ -0,0 +1,14 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +SUMMARY = "X.Org X server -- ARM SOC display driver" +LICENSE = "MIT-X & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" + +DEPENDS += "virtual/libx11 libdrm xorgproto" + +SRCREV = "8bbdb2ae3bb8ef649999a8da33ddbe11a04763b8" +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-armsoc" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} += "xserver-xorg-module-exa" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb index d409a1863..969c1a0a6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_18.0.1.bb @@ -6,18 +6,20 @@ SUMMARY = "X.Org X server -- ATI Radeon video driver" DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ - virtual/libgl xineramaproto libpciaccess" +DEPENDS += "virtual/libx11 libxvmc drm \ + virtual/libgl xorgproto libpciaccess" inherit distro_features_check REQUIRED_DISTRO_FEATURES += "opengl" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -SRC_URI[md5sum] = "f34d04a755e761e03b459155fa3ddcbb" -SRC_URI[sha256sum] = "401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa" +SRC_URI[md5sum] = "40e7c0a5a69aba3d84e0958f58705ea7" +SRC_URI[sha256sum] = "72ea3b8127d4550b64f797457f5a7851a541fa4ee2cc3f345b6c1886b81714a0" EXTRA_OECONF += "--disable-glamor" RDEPENDS_${PN} += "xserver-xorg-module-exa" RRECOMMENDS_${PN} += "linux-firmware-radeon" + +FILES_${PN} += "${datadir}/X11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb index cd680597c..182e18fd9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb @@ -16,6 +16,6 @@ SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" RDEPENDS_${PN} = "xserver-xorg-module-exa" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb index 2746821cd..2b1b87c4d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb @@ -6,8 +6,8 @@ SUMMARY = "X.Org X server -- nouveau video driver" DESCRIPTION = "Open-source X.org graphics driver for NVIDIA graphics" -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ - virtual/libgl xineramaproto libpciaccess" +DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ + virtual/libgl libpciaccess" RDEPENDS_${PN} += "xserver-xorg-module-exa" inherit distro_features_check diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb index 7d26d141f..3e5c31a05 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb @@ -3,7 +3,7 @@ require recipes-graphics/xorg-lib/xorg-lib-common.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907" SUMMARY = "XFIXES Extension" -DEPENDS += " xextproto xproto zlib" +DEPENDS += " xorgproto zlib" PE = "1" PR = "r11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb index 8ba5ac354..cb1ffcd8c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb @@ -1,6 +1,6 @@ require recipes-graphics/xorg-lib/xorg-lib-common.inc SUMMARY = "X Athena Widget Set" -DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxau xmlto-native" +DEPENDS += "xorgproto virtual/libx11 libxext libxt libxmu libxpm libxau xmlto-native" LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.0.bb new file mode 100644 index 000000000..4fe9992f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.0.bb @@ -0,0 +1,11 @@ +require recipes-graphics/xorg-lib/xorg-lib-common.inc +SUMMARY = "X Athena Widget Set" +DEPENDS += "xorgproto libxfixes libxrandr" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" + +SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/libXpresent-${PV}.tar.bz2" +SRC_URI[md5sum] = "edd87ac15bb666081898dd7382fcbff5" +SRC_URI[sha256sum] = "c11ae015141a9afbe10f4f2b8ee00b11adca6373dc1b9808d7c6c138b2da7b8a" + +XORG_PN = "libXpresent" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch new file mode 100644 index 000000000..3a50eff83 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch @@ -0,0 +1,116 @@ +--- xscreensaver-5.39.orig/configure.in ++++ xscreensaver-5.39/configure.in +@@ -14,6 +14,9 @@ + # + ############################################################################### + ++includedir='' ++libdir='' ++ + AH_TOP([ + /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. + * +@@ -422,12 +425,12 @@ + + OBJCC="$CC" + +- AC_MSG_CHECKING([whether the compiler works on ANSI C]) +- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), +- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) ++# AC_MSG_CHECKING([whether the compiler works on ANSI C]) ++# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], ++# AC_MSG_RESULT(yes), ++# AC_MSG_RESULT(no) ++# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), ++# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) + + if test -n "$GCC"; then + AC_MSG_RESULT(Turning on gcc compiler warnings.) +--- xscreensaver-5.39.orig/Makefile.in ++++ xscreensaver-5.39/Makefile.in +@@ -6,7 +6,7 @@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po ++SUBDIRS = utils jwxyz hacks/images hacks driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking README.VMS INSTALL \ + configure configure.in Makefile.in config.h.in \ +--- xscreensaver-5.39.orig/driver/Makefile.in ++++ xscreensaver-5.39/driver/Makefile.in +@@ -10,7 +10,7 @@ + top_srcdir = @top_srcdir@ + top_builddir = .. + +-install_prefix = ++install_prefix = ${DESTDIR} + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +@@ -221,7 +221,7 @@ + SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ + xscreensaver-text + SCRIPTS_OSX = xscreensaver-getimage-desktop +-SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ ++#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ + + HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ + xscreensaver.h prefs.h remote.h exec.h \ +--- xscreensaver-5.39.orig/hacks/Makefile.in ++++ xscreensaver-5.39/hacks/Makefile.in +@@ -10,7 +10,7 @@ + top_srcdir = @top_srcdir@ + top_builddir = .. + +-install_prefix = ++install_prefix = ${DESTDIR} + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +@@ -122,7 +122,7 @@ + asm6502.c abstractile.c lcdscrub.c hexadrop.c \ + tessellimage.c delaunay.c recanim.c binaryring.c \ + webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c +-SCRIPTS = vidwhacker webcollage ljlatest ++#SCRIPTS = vidwhacker webcollage ljlatest + + # Programs that are mentioned in XScreenSaver.ad, and that have XML files, + # but that are not shipped with xscreensaver itself. +@@ -163,7 +163,13 @@ + lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ + binaryring.o testx11.o + +-EXES = attraction blitspin bouboule braid decayscreen deco \ ++EXES = fontglide ++JPEG_EXES = webcollage-helper ++ ++RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ ++ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ ++ whirlygig worm xsublim juggle testx11 \ ++ attraction blitspin bouboule braid decayscreen deco \ + drift flame galaxy grav greynetic halo \ + helix hopalong ifs imsmap julia kaleidescope \ + maze moire noseguy pedal \ +@@ -179,17 +185,12 @@ + speedmine vermiculate twang apollonian euler2d \ + polyominoes thornbird fluidballs anemone halftone \ + metaballs eruption popsquares barcode piecewise cloudlife \ +- fontglide apple2 xanalogtv pong wormhole \ ++ apple2 xanalogtv pong wormhole \ + pacman fuzzyflakes anemotaxis memscroller substrate \ + intermomentary fireworkx fiberlamp boxfit interaggregate \ + celtic cwaves m6502 abstractile lcdscrub hexadrop \ + tessellimage binaryring \ + @JPEG_EXES@ +-JPEG_EXES = webcollage-helper +- +-RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ +- lightning lisa lissie lmorph rotor sphere spiral t3d vines \ +- whirlygig worm xsublim juggle testx11 + + HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ + $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch new file mode 100644 index 000000000..099a0b2f4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch @@ -0,0 +1,273 @@ +--- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in ++++ xscreensaver-5.39/driver/XScreenSaver.ad.in +@@ -29,7 +29,7 @@ + ! /* (xrdb prevention kludge: whole file) + + *mode: random +-*timeout: 0:10:00 ++*timeout: 0:15:00 + *cycle: 0:10:00 + *lockTimeout: 0:00:00 + *passwdTimeout: 0:00:30 +@@ -38,7 +38,7 @@ + *dpmsStandby: 2:00:00 + *dpmsSuspend: 2:00:00 + *dpmsOff: 4:00:00 +-*grabDesktopImages: True ++*grabDesktopImages: False + *grabVideoFrames: False + *chooseRandomImages: @DEFAULT_IMAGES_P@ + ! This can be a local directory name, or the URL of an RSS or Atom feed. +@@ -48,11 +48,11 @@ + *lock: False + *verbose: False + *timestamp: True +-*fade: True ++*fade: False + *unfade: False + *fadeSeconds: 0:00:03 + *fadeTicks: 20 +-*splash: True ++*splash: False + *splashDuration: 0:00:05 + *visualID: default + *captureStderr: True +@@ -158,236 +158,8 @@ + ! screen savers interactively. + ! + *programs: \ +- maze -root \n\ +-@GL_KLUDGE@ GL: superquadrics -root \n\ +- attraction -root \n\ +- blitspin -root \n\ +- greynetic -root \n\ +- helix -root \n\ +- hopalong -root \n\ +- imsmap -root \n\ +-- noseguy -root \n\ +-- pyro -root \n\ +- qix -root \n\ +-- rocks -root \n\ +- rorschach -root \n\ +- decayscreen -root \n\ +- flame -root \n\ +- halo -root \n\ +- slidescreen -root \n\ +- pedal -root \n\ +- bouboule -root \n\ +-- braid -root \n\ +- coral -root \n\ +- deco -root \n\ +- drift -root \n\ +-- fadeplot -root \n\ +- galaxy -root \n\ +- goop -root \n\ +- grav -root \n\ +- ifs -root \n\ +-@GL_KLUDGE@ GL: jigsaw -root \n\ +- julia -root \n\ +-- kaleidescope -root \n\ +-@GL_KLUDGE@ GL: moebius -root \n\ +- moire -root \n\ +-@GL_KLUDGE@ GL: morph3d -root \n\ +- mountain -root \n\ +- munch -root \n\ +- penrose -root \n\ +-@GL_KLUDGE@ GL: pipes -root \n\ +- rd-bomb -root \n\ +-@GL_KLUDGE@ GL: rubik -root \n\ +-- sierpinski -root \n\ +- slip -root \n\ +-@GL_KLUDGE@ GL: sproingies -root \n\ +- starfish -root \n\ +- strange -root \n\ +- swirl -root \n\ +- triangle -root \n\ +- xjack -root \n\ +- xlyap -root \n\ +-@GL_KLUDGE@ GL: atlantis -root \n\ +- bsod -root \n\ +-@GL_KLUDGE@ GL: bubble3d -root \n\ +-@GL_KLUDGE@ GL: cage -root \n\ +-- crystal -root \n\ +- cynosure -root \n\ +- discrete -root \n\ +- distort -root \n\ +- epicycle -root \n\ +- flow -root \n\ +-@GL_KLUDGE@ GL: glplanet -root \n\ +- interference -root \n\ +- kumppa -root \n\ +-@GL_KLUDGE@ GL: lament -root \n\ +- moire2 -root \n\ +-@GL_KLUDGE@ GL: sonar -root \n\ +-@GL_KLUDGE@ GL: stairs -root \n\ +- truchet -root \n\ +-- vidwhacker -root \n\ +- blaster -root \n\ +- bumps -root \n\ +- ccurve -root \n\ +- compass -root \n\ +- deluxe -root \n\ +-- demon -root \n\ +-@GLE_KLUDGE@ GL: extrusion -root \n\ +-- loop -root \n\ +- penetrate -root \n\ +- petri -root \n\ +- phosphor -root \n\ +-@GL_KLUDGE@ GL: pulsar -root \n\ +- ripples -root \n\ +- shadebobs -root \n\ +-@GL_KLUDGE@ GL: sierpinski3d -root \n\ +- spotlight -root \n\ +- squiral -root \n\ +- wander -root \n\ +-- webcollage -root \n\ +- xflame -root \n\ +- xmatrix -root \n\ +-@GL_KLUDGE@ GL: gflux -root \n\ +-- nerverot -root \n\ +- xrayswarm -root \n\ +- xspirograph -root \n\ +-@GL_KLUDGE@ GL: circuit -root \n\ +-@GL_KLUDGE@ GL: dangerball -root \n\ +-- GL: dnalogo -root \n\ +-@GL_KLUDGE@ GL: engine -root \n\ +-@GL_KLUDGE@ GL: flipscreen3d -root \n\ +-@GL_KLUDGE@ GL: gltext -root \n\ +-@GL_KLUDGE@ GL: menger -root \n\ +-@GL_KLUDGE@ GL: molecule -root \n\ +- rotzoomer -root \n\ +- speedmine -root \n\ +-@GL_KLUDGE@ GL: starwars -root \n\ +-@GL_KLUDGE@ GL: stonerview -root \n\ +- vermiculate -root \n\ +- whirlwindwarp -root \n\ +- zoom -root \n\ +- anemone -root \n\ +- apollonian -root \n\ +-@GL_KLUDGE@ GL: boxed -root \n\ +-@GL_KLUDGE@ GL: cubenetic -root \n\ +-@GL_KLUDGE@ GL: endgame -root \n\ +- euler2d -root \n\ +- fluidballs -root \n\ +-@GL_KLUDGE@ GL: flurry -root \n\ +-- GL: glblur -root \n\ +-@GL_KLUDGE@ GL: glsnake -root \n\ +- halftone -root \n\ +-@GL_KLUDGE@ GL: juggler3d -root \n\ +-@GL_KLUDGE@ GL: lavalite -root \n\ +-- polyominoes -root \n\ +-@GL_KLUDGE@ GL: queens -root \n\ +-- GL: sballs -root \n\ +-@GL_KLUDGE@ GL: spheremonics -root \n\ +-- thornbird -root \n\ +- twang -root \n\ +-- GL: antspotlight -root \n\ +- apple2 -root \n\ +-@GL_KLUDGE@ GL: atunnel -root \n\ +- barcode -root \n\ +-@GL_KLUDGE@ GL: blinkbox -root \n\ +-@GL_KLUDGE@ GL: blocktube -root \n\ +-@GL_KLUDGE@ GL: bouncingcow -root \n\ +- cloudlife -root \n\ +-@GL_KLUDGE@ GL: cubestorm -root \n\ +- eruption -root \n\ +-@GL_KLUDGE@ GL: flipflop -root \n\ +-@GL_KLUDGE@ GL: flyingtoasters -root \n\ +- fontglide -root \n\ +-@GL_KLUDGE@ GL: gleidescope -root \n\ +-@GL_KLUDGE@ GL: glknots -root \n\ +-@GL_KLUDGE@ GL: glmatrix -root \n\ +-- GL: glslideshow -root \n\ +-@GL_KLUDGE@ GL: hypertorus -root \n\ +-- GL: jigglypuff -root \n\ +- metaballs -root \n\ +-@GL_KLUDGE@ GL: mirrorblob -root \n\ +- piecewise -root \n\ +-@GL_KLUDGE@ GL: polytopes -root \n\ +- pong -root \n\ +- popsquares -root \n\ +-@GL_KLUDGE@ GL: surfaces -root \n\ +- xanalogtv -root \n\ +- abstractile -root \n\ +- anemotaxis -root \n\ +-- GL: antinspect -root \n\ +- fireworkx -root \n\ +- fuzzyflakes -root \n\ +- interaggregate -root \n\ +- intermomentary -root \n\ +- memscroller -root \n\ +-@GL_KLUDGE@ GL: noof -root \n\ +- pacman -root \n\ +-@GL_KLUDGE@ GL: pinion -root \n\ +-@GL_KLUDGE@ GL: polyhedra -root \n\ +-- GL: providence -root \n\ +- substrate -root \n\ +- wormhole -root \n\ +-- GL: antmaze -root \n\ +-@GL_KLUDGE@ GL: boing -root \n\ +- boxfit -root \n\ +-@GL_KLUDGE@ GL: carousel -root \n\ +- celtic -root \n\ +-@GL_KLUDGE@ GL: crackberg -root \n\ +-@GL_KLUDGE@ GL: cube21 -root \n\ +- fiberlamp -root \n\ +-@GL_KLUDGE@ GL: fliptext -root \n\ +-@GL_KLUDGE@ GL: glhanoi -root \n\ +-@GL_KLUDGE@ GL: tangram -root \n\ +-@GL_KLUDGE@ GL: timetunnel -root \n\ +-@GL_KLUDGE@ GL: glschool -root \n\ +-@GL_KLUDGE@ GL: topblock -root \n\ +-@GL_KLUDGE@ GL: cubicgrid -root \n\ +- cwaves -root \n\ +-@GL_KLUDGE@ GL: gears -root \n\ +-@GL_KLUDGE@ GL: glcells -root \n\ +-@GL_KLUDGE@ GL: lockward -root \n\ +- m6502 -root \n\ +-@GL_KLUDGE@ GL: moebiusgears -root \n\ +-@GL_KLUDGE@ GL: voronoi -root \n\ +-@GL_KLUDGE@ GL: hypnowheel -root \n\ +-@GL_KLUDGE@ GL: klein -root \n\ +-- lcdscrub -root \n\ +-@GL_KLUDGE@ GL: photopile -root \n\ +-@GL_KLUDGE@ GL: skytentacles -root \n\ +-@GL_KLUDGE@ GL: rubikblocks -root \n\ +-@GL_KLUDGE@ GL: companioncube -root \n\ +-@GL_KLUDGE@ GL: hilbert -root \n\ +-@GL_KLUDGE@ GL: tronbit -root \n\ +-@GL_KLUDGE@ GL: geodesic -root \n\ +- hexadrop -root \n\ +-@GL_KLUDGE@ GL: kaleidocycle -root \n\ +-@GL_KLUDGE@ GL: quasicrystal -root \n\ +-@GL_KLUDGE@ GL: unknownpleasures -root \n\ +- binaryring -root \n\ +-@GL_KLUDGE@ GL: cityflow -root \n\ +-@GL_KLUDGE@ GL: geodesicgears -root \n\ +-@GL_KLUDGE@ GL: projectiveplane -root \n\ +-@GL_KLUDGE@ GL: romanboy -root \n\ +- tessellimage -root \n\ +-@GL_KLUDGE@ GL: winduprobot -root \n\ +-@GL_KLUDGE@ GL: splitflap -root \n\ +-@GL_KLUDGE@ GL: cubestack -root \n\ +-@GL_KLUDGE@ GL: cubetwist -root \n\ +-@GL_KLUDGE@ GL: discoball -root \n\ +-@GL_KLUDGE@ GL: dymaxionmap -root \n\ +-@GL_KLUDGE@ GL: energystream -root \n\ +-@GL_KLUDGE@ GL: hexstrut -root \n\ +-@GL_KLUDGE@ GL: hydrostat -root \n\ +-@GL_KLUDGE@ GL: raverhoop -root \n\ +-@GL_KLUDGE@ GL: splodesic -root \n\ +-@GL_KLUDGE@ GL: unicrud -root \n\ +-@GL_KLUDGE@ GL: esper -root \n\ +-@GL_KLUDGE@ GL: vigilance -root \n\ +-@GL_KLUDGE@ GL: crumbler -root \n\ +-@GL_KLUDGE@ GL: maze3d -root \n\ +-@GL_KLUDGE@ GL: peepers -root \n\ +-@GL_KLUDGE@ GL: razzledazzle -root \n +- ++- fontglide -root -program "date +'%F %H:%M %z'" \n\ ++ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n + + + !============================================================================= diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service new file mode 100755 index 000000000..17dfe75ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/xscreensaver.service @@ -0,0 +1,14 @@ +[Unit] +Description=Xscreensaver service +PartOf=xserver-nodm.service +After=xserver-nodm.service + +[Service] +ExecStart=/usr/bin/xscreensaver +Environment="DISPLAY=:0" +User=xuser +Restart=always +RestartSec=1 + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb new file mode 100644 index 000000000..6ebf3c798 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -0,0 +1,29 @@ +SUMMARY = "X screen saver and locker" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=e141ab5822fb2d43694e1e47b59fc0df" + +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" +SRC_URI[md5sum] = "a5da62b91271f4e8afcc73d44697364b" +SRC_URI[sha256sum] = "48ce1880f18b5321182be0c033aeceb5ec5628a1505b9d1ff69dbf06093c2426" + +SRC_URI += " \ + file://xscreensaver.service \ + file://fix-buildscripts.patch \ + file://tweak-app-defaults.patch \ +" + +DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" +# These are only needed as part of the stopgap screensaver implementation: +RDEPENDS_${PN} += "xserver-nodm-init liberation-fonts" + +inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append() { + install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service +} + +FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" +SYSTEMD_SERVICE_${PN} = "xscreensaver.service" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh deleted file mode 100644 index fa43617bd..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - n=1 - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] - do - /usr/bin/xtscal - sleep 1 - n=$(($n+1)) - done -fi diff --git a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch deleted file mode 100644 index 1da771786..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - ---- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 -+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 -@@ -131,9 +131,10 @@ - { - XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); - -- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- WIDTH + 1, WIDTH + 1, 0, 360 * 64); -+ XFillRectangle (dpy, crosshair_w, crosshair_gc, -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ WIDTH, WIDTH); - } - - void diff --git a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch deleted file mode 100644 index f7b0854c3..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch +++ /dev/null @@ -1,621 +0,0 @@ ---- - Makefile.am | 9 -- - configure.ac | 3 - gpe-dist.am | 12 --- - h3600_ts.h | 216 ----------------------------------------------------------- - main.c | 210 ++------------------------------------------------------- - xtscal.in | 19 ----- - 6 files changed, 14 insertions(+), 455 deletions(-) - -Upstream-Status: Pending - -Index: xtscal-0.6.3/xtscal.in -=================================================================== ---- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,19 +0,0 @@ --#!/bin/sh -- --module_id() { -- # Get model name -- echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` --} -- --case `module_id` in -- "HP IPAQ H3100" | "HP IPAQ H3800" ) -- ARGS="-rotate 90" ;; -- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) -- ARGS="-rotate 270" ;; -- # H2200: works without rotation --esac -- --# the things we do for autoconf --prefix=@prefix@ --exec_prefix=@exec_prefix@ --exec @libexecdir@/xtscal.bin $ARGS $* -Index: xtscal-0.6.3/main.c -=================================================================== ---- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 -+++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 -@@ -22,12 +22,10 @@ - #include <X11/Xlib.h> - - #include <X11/extensions/Xrender.h> --#include <X11/extensions/Xrandr.h> - #include <X11/Xft/Xft.h> - #include <X11/extensions/xcalibrate.h> - #include <X11/keysym.h> - --#include "h3600_ts.h" - #include "calibrate.h" - - Display *dpy; -@@ -45,15 +43,11 @@ XftColor xftcol; - XftDraw *xftdraw; - XftFont *xftfont; - int screen_x, screen_y; --int ts_fd; - int samples; - Pixmap bg_pixmap; - int flag_debug; --int rotation = 0; - int error_base, event_base; - --int using_xcalibrate; -- - int moving; - - #define CROSSHAIR_SIZE 25 -@@ -63,7 +57,6 @@ int moving; - #define ENOUGH 5 - #define MAX_SAMPLES 40 - --#define RAW_DEVICE "/dev/h3600_tsraw" - #define FONTNAME "sans-10" - - struct point -@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) - void - set_calibration (calibration *cal) - { -- TS_CAL tc; -- int xtrans, ytrans, xscale, yscale, xyscale, yxscale; - calibration ocal = *cal; - -- if (using_xcalibrate) -- { - FILE *fp; - if (flag_debug) - printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); -@@ -304,29 +293,6 @@ set_calibration (calibration *cal) - } - fprintf (fp, "%d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); - fclose (fp); -- return; -- } -- -- xtrans = cal->a[0] / cal->a[6]; -- ytrans = cal->a[3] / cal->a[6]; -- xscale = cal->a[1] * 256 / cal->a[6]; -- yscale = cal->a[5] * 256 / cal->a[6]; -- xyscale = cal->a[2] * 256 / cal->a[6]; -- yxscale = cal->a[4] * 256 / cal->a[6]; -- -- tc.xtrans = xtrans; -- tc.ytrans = ytrans; -- tc.xscale = xscale; -- tc.yscale = yscale; -- tc.xyswap = 0; -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } - } - - void -@@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press - } - - void --read_ts (void) --{ -- TS_EVENT ts_ev; -- int r; -- -- r = read (ts_fd, &ts_ev, sizeof (ts_ev)); -- if (r == sizeof (ts_ev)) -- handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); --} -- --void --do_cal (char **args) --{ -- TS_CAL tc; -- -- tc.xscale = atoi (args[0]); -- tc.xtrans = atoi (args[1]); -- tc.yscale = atoi (args[2]); -- tc.ytrans = atoi (args[3]); -- tc.xyswap = atoi (args[4]); -- -- if (flag_debug) -- fprintf (stderr, "setting: %d %d %d %d %d\n", -- tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } -- -- exit (0); --} -- --void --show_cal (void) --{ -- TS_CAL tc; -- -- if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_GET_CAL"); -- exit (1); -- } -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); --} -- --void - usage (const char *name) - { -- fprintf (stderr, "usage: %s -view\n", name); -- fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); -- fprintf (stderr, " %s -cal <xs> <xt> <ys> <yt> <xyswap>\n", name); -- -+ fprintf (stderr, "usage: %s [-debug]\n", name); - exit (1); - } - - int --xrr_supported (void) --{ -- int xrr_event_base, xrr_error_base; -- int xrr_major, xrr_minor; -- -- if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False -- || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 -- || xrr_major != 1 -- || xrr_minor < 1) -- return 0; -- -- return 1; --} -- --int - main (int argc, char *argv[]) - { - XSetWindowAttributes attributes; -@@ -480,31 +379,11 @@ main (int argc, char *argv[]) - int max_fd; - GC bg_gc; - int i; -- int have_xrandr; - - for (i = 1; i < argc; i++) - { -- if (!strcmp (argv[i], "-view")) -- { -- show_cal (); -- exit (0); -- } -- else if (!strcmp (argv[i], "-debug")) -+ if (!strcmp (argv[i], "-debug")) - flag_debug = 1; -- else if (!strcmp (argv[i], "-cal")) -- { -- if (argc > (i + 5)) -- do_cal (argv + i + 1); -- else -- usage (argv[0]); -- } -- else if (!strcmp (argv[i], "-rotate")) -- { -- if (argc > (i + 1)) -- rotation = atoi (argv[++i]); -- else -- usage (argv[0]); -- } - else - usage (argv[0]); - } -@@ -531,48 +410,11 @@ main (int argc, char *argv[]) - fprintf (stderr, "failed to set raw mode: error %d\n", r); - exit (1); - } -- -- using_xcalibrate = 1; -- } -- -- have_xrandr = xrr_supported (); -- if (have_xrandr) -- { -- XRRScreenConfiguration *rr_screen; -- Rotation current_rotation; -- -- if (flag_debug) -- fprintf (stderr, "XRANDR is supported\n"); -- -- rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); -- -- XRRRotations (dpy, screen, ¤t_rotation); -- -- XRRFreeScreenConfigInfo (rr_screen); -- -- if (flag_debug) -- fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); -- -- switch (current_rotation) -- { -- case RR_Rotate_270: -- rotation += 90; -- case RR_Rotate_180: -- rotation += 90; -- case RR_Rotate_90: -- rotation += 90; -- rotation %= 360; -- case RR_Rotate_0: -- break; -- default: -- fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); -- break; -- } - } - else - { -- if (flag_debug) -- fprintf (stderr, "XRANDR not supported\n"); -+ perror ("XCALIBRATE extension missing"); -+ exit (1); - } - - attributes.override_redirect = flag_debug ? False : True; -@@ -666,45 +508,17 @@ main (int argc, char *argv[]) - - for (i = 0; i < NR_POINTS; i++) - { -- switch (rotation) -- { -- case 0: -- cal.xfb[i] = cal.xscr[i]; -- cal.yfb[i] = cal.yscr[i]; -- break; -- case 90: -- cal.xfb[i] = cal.yscr[i]; -- cal.yfb[i] = screen_x - cal.xscr[i]; -- break; -- case 180: -- cal.xfb[i] = screen_x - cal.xscr[i]; -- cal.yfb[i] = screen_y - cal.yscr[i]; -- break; -- case 270: -- cal.xfb[i] = screen_y - cal.yscr[i]; -- cal.yfb[i] = cal.xscr[i]; -- break; -- } -+ cal.xfb[i] = cal.xscr[i]; -+ cal.yfb[i] = cal.yscr[i]; -+ XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); - - if (flag_debug) -- printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, -+ printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", - cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); - } - - next_event (); - -- if (!using_xcalibrate) -- { -- ts_fd = open (RAW_DEVICE, O_RDONLY); -- if (ts_fd < 0) -- { -- perror (RAW_DEVICE); -- exit (1); -- } -- } -- -- max_fd = (xfd > ts_fd) ? xfd : ts_fd; -- - for (;;) - { - fd_set fds; -@@ -713,12 +527,8 @@ main (int argc, char *argv[]) - - FD_ZERO (&fds); - FD_SET (xfd, &fds); -- if (ts_fd != -1) -- FD_SET (ts_fd, &fds); - -- select (max_fd + 1, &fds, NULL, NULL, NULL); -- -- if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) -- read_ts (); -+ select (xfd + 1, &fds, NULL, NULL, NULL); - } - } -+ -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 -+++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 -@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) - - AC_CONFIG_FILES([Makefile]) --AC_CONFIG_FILES([xtscal]) - AC_OUTPUT -Index: xtscal-0.6.3/gpe-dist.am -=================================================================== ---- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,12 +0,0 @@ --CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) -- --dist-upload: dist -- scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ -- --tag: -- cvs tag $(CVSTAG) -- --retag: -- cvs tag -F $(CVSTAG) -- --source: tag dist-upload -Index: xtscal-0.6.3/h3600_ts.h -=================================================================== ---- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,216 +0,0 @@ --/* --* --* Driver for the H3600 Touch Screen and other Atmel controlled devices. --* --* Copyright 2000 Compaq Computer Corporation. --* --* Use consistent with the GNU GPL is permitted, --* provided that this copyright notice is --* preserved in its entirety in all copies and derived works. --* --* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, --* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS --* FITNESS FOR ANY PARTICULAR PURPOSE. --* --* Author: Charles Flynn. --* --*/ -- -- --#ifndef __H3600_TS_H__ --#define __H3600_TS_H__ -- --#include <linux/ioctl.h> -- --enum h3600_ts_minor_devices { -- TS_MINOR = 0, -- TSRAW_MINOR = 1, -- KEY_MINOR = 2 --}; -- --typedef struct h3600_ts_calibration { -- int xscale; -- int xtrans; -- int yscale; -- int ytrans; -- int xyswap; --} TS_CAL; -- --typedef struct h3600_ts_event { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_EVENT; -- --/* Deprecated - do not use */ --typedef struct h3600_ts_return { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_RET; -- --enum power_button_mode { -- PBM_SUSPEND = 0, -- PBM_GENERATE_KEYPRESS = 1 --}; -- -- --/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ -- --typedef struct therm_dev { -- short data; --} THERM_DEV; -- --#define H3600_BATT_CHEM_ALKALINE 0x01 --#define H3600_BATT_CHEM_NICD 0x02 --#define H3600_BATT_CHEM_NIMH 0x03 --#define H3600_BATT_CHEM_LION 0x04 --#define H3600_BATT_CHEM_LIPOLY 0x05 --#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 --#define H3600_BATT_CHEM_UNKNOWN 0xff -- --/* These should match the apm_bios.h definitions */ --#define H3600_AC_STATUS_AC_OFFLINE 0x00 --#define H3600_AC_STATUS_AC_ONLINE 0x01 --#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ --#define H3600_AC_STATUS_AC_UNKNOWN 0xff -- --/* These bitfields are rarely "or'd" together */ --#define H3600_BATT_STATUS_HIGH 0x01 --#define H3600_BATT_STATUS_LOW 0x02 --#define H3600_BATT_STATUS_CRITICAL 0x04 --#define H3600_BATT_STATUS_CHARGING 0x08 --#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 --#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ --#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ --#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ --#define H3600_BATT_STATUS_NOBATT 0x80 --#define H3600_BATT_STATUS_UNKNOWN 0xff -- --struct battery_data { -- unsigned char chemistry; -- unsigned char status; -- unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ -- unsigned short percentage; /* Percentage of full charge */ -- unsigned short life; /* Life remaining in minutes */ --}; -- --struct h3600_battery { -- unsigned char ac_status; -- unsigned char battery_count; /* How many batteries we have */ -- struct battery_data battery[2]; --}; -- --/* -------- EEPROM and SPI Interfaces ---------------*/ -- --#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ --#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ --#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ --#define SPI_WR_BUFSIZ 7 -- --/* The EEPROM is where internal programs are stored on the Amtel. -- You probably don't want to read or write these values */ -- --typedef struct h3600_eeprom_read_request { -- unsigned char addr; /* 8bit Address Offset 0-255 */ -- unsigned char len; /* Number of 16bit words to read 0-128 */ -- unsigned short buff[EEPROM_RD_BUFSIZ]; --} EEPROM_READ; -- --typedef struct h3600_eeprom_write_request { -- unsigned char len; /* used only to compute the number of bytes to send */ -- unsigned char addr; /* 0-128 */ -- unsigned short buff[EEPROM_WR_BUFSIZ]; --} EEPROM_WRITE; -- --/* The SPI bus connects to EEPROMs located on sleeves plugged into -- the iPAQ. You may want to read these values */ -- --typedef struct h3600_spi_read_request { -- unsigned short addr; /* 16bit Address Offset 0-128 */ -- unsigned char len; /* Number of bytes to read */ -- unsigned char buff[SPI_RD_BUFSIZ]; --} SPI_READ; -- --#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ -- --typedef struct h3600_spi_write_request { -- unsigned short len; /* used only to compute the number of bytes to send */ -- unsigned short addr; /* this 16bit address accesses a single byte */ -- unsigned char buff[SPI_WR_BUFSIZ]; --} SPI_WRITE; -- -- --/* -------- end of EEPROM and SPI Interfaces ---------------*/ -- --/* User space structures for IOCTL calls */ -- --typedef struct h3600_ts_version { -- unsigned char host_version[8]; /* ascii "x.yy" */ -- unsigned char pack_version[8]; /* ascii "x.yy" */ -- unsigned char boot_type; /* TODO ?? */ --} VER_RET; -- --typedef struct h3600_ts_led { -- unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ -- unsigned char TotalTime; /* Units of 5 seconds */ -- unsigned char OnTime; /* units of 100m/s */ -- unsigned char OffTime; /* units of 100m/s */ --} LED_IN; -- --enum flite_mode { -- FLITE_MODE1 = 1, -- FLITE_AUTO_MODE = 1, /* for reference only */ -- FLITE_MANUAL_MODE = 2, /* Use this normally? */ -- FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ --}; --enum flite_pwr { -- FLITE_PWR_OFF = 0, -- FLITE_PWR_ON = 1 --}; -- --typedef struct h3600_ts_flite { -- unsigned char mode; -- unsigned char pwr; -- unsigned char brightness; --} FLITE_IN; -- --/*************************** Updated "universal" structures *******************/ -- --/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ --struct h3600_ts_backlight { -- enum flite_pwr power; /* 0 = off, 1 = on */ -- unsigned char brightness; /* 0 - 255 */ --}; -- --struct h3600_ts_contrast { /* Only useful on H3100 model */ -- unsigned char contrast; /* 0 - 255 */ --}; -- --/* IOCTL cmds user or kernel space */ -- --/* Use 'f' as magic number */ --#define IOC_H3600_TS_MAGIC 'f' -- --/* TODO: Some of these IOWR values are just plain wrong */ --#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) --#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) --#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) --#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) --#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) --#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) --#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) --#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) --#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) --#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) --#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) -- --/* New IOCTL interfaces - defined to be more user friendly */ --#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) --#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) -- --#endif -Index: xtscal-0.6.3/Makefile.am -=================================================================== ---- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 -+++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 -@@ -1,11 +1,8 @@ --libexec_PROGRAMS = xtscal.bin --bin_SCRIPTS = xtscal -+bin_PROGRAMS = xtscal - --xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h -+xtscal_SOURCES = main.c calibrate.c calibrate.h - --xtscal_bin_LDADD = @XTSCAL_LIBS@ -+xtscal_LDADD = @XTSCAL_LIBS@ - - INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 - --include gpe-dist.am -- diff --git a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch deleted file mode 100644 index 3e4533f78..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified -This patch avoids this linking error: - -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make: *** [xtscal] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Pending - -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac -+++ xtscal-0.6.3/configure.ac -@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT diff --git a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb deleted file mode 100644 index 4bfddf06b..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Touchscreen calibration utility" - -DESCRIPTION = "Basic touchscreen calibration utility" - -HOMEPAGE = "http://gpe.linuxtogo.org" -BUGTRACKER = "http://bugs.linuxtogo.org" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" - -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 libxft libxcalibrate" - -PR = "r13" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://change-cross.patch \ - file://cleanup.patch \ - file://dso_linking_change_build_fix.patch \ - file://30xTs_Calibrate.sh" - -SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" -SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ -} |
