32 Commits
master ... thud

Author SHA1 Message Date
Andreas Müller
e72f9e14ce Merge pull request #84 from MA-MWO/thud
Changed SRC_URI to https as ftp source was not available on 2021-05-17
2021-05-17 22:05:18 +02:00
Markus Wolf
d48aa6c934 Changed SRC_URI to https as ftp source was not available on 20210517 2021-05-17 16:43:43 +02:00
Andreas Müller
6f5a2513a9 sddm-autologin.pam: remove pam_permit.so
Not the best idea to just trust what people send...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-05 22:34:38 +01:00
Andreas Müller
48ab2dad10 qtiohelper: upgrade 0.3.994+ -> 0.4.0+
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-10-24 11:46:28 +02:00
Max Krummenacher
641aabf595 sddm: make libpam optional
Rescently pam was added as new setting in DISTRO_FEATURES. If it is not defined sddm
currently fails as it unconditionally depends on pam.

This fixes:
| ERROR: Nothing PROVIDES 'libpam' (but .../sddm_git.bb DEPENDS on or otherwise requires it)
| libpam was skipped: missing required distro feature 'pam' (not in DISTRO_FEATURES)

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-04-27 19:07:06 +02:00
Max Krummenacher
c3e6b0c2eb lximage-qt: work around wrong qconfig.h included
qconfig.h from the native sysroot is included which results in the following errors:

| .../0.14.1-r0/git/src/mainwindow.cpp:727:36: error: 'QGraphicsSvgItem' does not name a type; did you mean 'QGraphicsItem'?
| .../0.14.1-r0/git/src/imageview.cpp:329:5: error: 'QGraphicsSvgItem' was not declared in this scope

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-04-27 19:06:47 +02:00
Max Krummenacher
9346cf05fa qps: fix build failure
| .../qps/1.10.20-r0/git/src/screenshot.cpp:378:10: fatal error: X11/extensions/Xrender.h: No such file or directory

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2019-04-27 19:06:29 +02:00
Andreas Müller
cfe91e5789 guitarix: fix build with boost >= 1.69.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-25 09:59:17 +01:00
Andreas Müller
2535943408 liri-eglfs: remove screen-recorder code
* it uses OpenGL3 which is not available on common machines
* what is it doing exactly...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 16:14:37 +01:00
Andreas Müller
81bafc6045 liri-qtgsettings: upgrade sources
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 15:41:07 +01:00
Andreas Müller
d67918a112 liri-shell: upgrade sources
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 15:26:45 +01:00
Andreas Müller
2b7e58e352 liri-cmake-shared: upgrade sources
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 15:26:12 +01:00
Andreas Müller
7f9f0f98a4 sddm: upgrade 0.18.0 -> 0.18.1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 15:23:23 +01:00
Andreas Müller
746ed64373 readd our python3-pyqt5 for thud
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 15:09:57 +01:00
Andreas Müller
530170adb5 Revert "menu-cache: remove 1.1.0 in in oe-core master"
menu-cache 1.1.0 came to oe-core after thud

This reverts commit 3f86893963.
2019-03-22 13:24:43 +01:00
Andreas Müller
f9e77021de Revert "kcachegrind: add graphviz to RRECOMMENDS"
On thud there is no graphviz in meta-oe yet

This reverts commit e23602bc38.
2019-03-22 11:09:53 +01:00
Andreas Müller
6c670a475d Revert "pulseview: new package"
sigrock recipes came to meta-oe after thud

This reverts commit d28ed0dea6.
2019-03-22 10:48:32 +01:00
Andreas Müller
99859ac8f2 Revert "ftgl: remove - it is in meta-oe now"
On thud ftgl is not yet in meta-oe

This reverts commit 4bbbb42131.
2019-03-22 10:46:31 +01:00
Andreas Müller
93345ef5d0 Merge commit '68ee7a7d5b8eeb10f56de7d4cbe844ab275deeaf' into thud
This updates many packages from master

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-03-22 10:30:36 +01:00
Andreas Müller
5092528e63 krita: upgrade 4.1.0 -> 4.1.7
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-09 00:42:51 +01:00
Andreas Müller
eedf8d776d libraw: upgrade 0.18.8 -> 0.19.2
Seems they remove old tarballs so move to github repo

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-09 00:42:37 +01:00
Andreas Müller
cfdd7cef66 exiv2: add all CVE patches found ad fedora
see [1]

[1] https://src.fedoraproject.org/cgit/rpms/exiv2.git/

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:03:28 +01:00
Andreas Müller
c0975ababa exiv2: remove bogus do_install prepend
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:03:17 +01:00
Andreas Müller
93bf5449fa exiv2: update SRC_URI
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:03:06 +01:00
Andreas Müller
23d1d614ca Revert "exiv2: updated to version 0.27.0 (#66)"
I breaks most dependent recipes

This reverts commit 9a781a7988.
2019-01-04 21:02:55 +01:00
Guillermo
0c85f97c44 exiv2: updated to version 0.27.0 (#66)
* exiv2: updated to version 0.27.0

* exiv2: recipe for version 0.26 removed
2019-01-04 17:08:38 +01:00
Andreas Müller
f808a07052 kdeclarative: Fix build if QML-debugger was not enabled
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-01 20:55:13 +01:00
Andreas Müller
08e507efbb python(3)-pyqt5: Enable all PACKAGECONFIGs building fine
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-06 21:15:41 +01:00
Andreas Müller
8dde8f5444 carla: adjust to pyqt changes
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-06 21:15:41 +01:00
Andreas Müller
5f6e8f07fb python3-pyqt5: align to our needs
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-06 21:15:41 +01:00
Andreas Müller
610819dace python3-pyqt5: remove - use meta-qt5's recipe
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-06 21:15:41 +01:00
Andreas Müller
50fb943746 sip3: remove - let's use meta-oe's recipe
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-12-06 21:15:41 +01:00
25 changed files with 324 additions and 43 deletions

View File

@@ -2,7 +2,7 @@
BBPATH .= ":${LAYERDIR}"
# recipes
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
# appends
BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"

View File

@@ -1 +0,0 @@
PACKAGECONFIG += "cxx"

View File

@@ -42,4 +42,3 @@ do_install() {
}
FILES_python3-sip = "${libdir}/${PYTHON_DIR}/site-packages/"
FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"

View File

@@ -28,5 +28,3 @@ SRC_URI[sha256sum] = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eee
FILES_${PN} += " \
${datadir}/kxmlgui5 \
"
RRECOMMENDS_${PN} += "graphviz"

View File

@@ -10,7 +10,7 @@ inherit liri
DEPENDS = "cmake-native"
PV = "1.0.0+git${SRCPV}"
SRCREV = "655e4a9130c3c5293e3d8e7e72fba2a945f8d1c8"
SRCREV = "f4d26dff4e814b17a6765ca186299ecdb32c4d54"
S = "${WORKDIR}/git"
FILES_${PN}-dev += "${datadir}/LiriCMakeShared"

View File

@@ -0,0 +1,94 @@
From e04f58b58b3fd55786e3bc4ef5e8db10327aee1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 22 Mar 2019 15:51:42 +0100
Subject: [PATCH] qeglfskmsgbmscreen: remove frame recording completely
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Maybe I am paranoid but it is at least questionable what it is good for
* It seems causes build trouble for at least iMX/vivante [1]
[1] https://github.com/schnitzeltony/meta-qt5-extra/issues/67
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../eglfs_kms/qeglfskmsgbmscreen.cpp | 55 +------------------
1 file changed, 1 insertion(+), 54 deletions(-)
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
index 61cc94f..33a7568 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
@@ -45,7 +45,6 @@
#include "qeglfsintegration_p.h"
#include <QtCore/QLoggingCategory>
-#include <QOpenGLFunctions_3_0>
#include <QtGui/private/qguiapplication_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h>
@@ -348,59 +347,7 @@ void QEglFSKmsGbmScreen::flip()
void QEglFSKmsGbmScreen::recordFrame(EGLClientBuffer bo, int width, int height)
{
- // Create EGL image from BO
- EGLImage image = eglCreateImage(display(), nullptr, EGL_NATIVE_PIXMAP_KHR, bo, nullptr);
- if (image == EGL_NO_IMAGE_KHR) {
- qCritical("Error creating EGLImage: %s", formatGLError(glGetError()));
- return;
- }
-
- // Create GL 2D texture for framebuffer
- GLuint texture;
- glGenTextures(1, &texture);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glBindTexture(GL_TEXTURE_2D, texture);
- PFNGLEGLIMAGETARGETTEXTURE2DOESPROC imageTexture2D =
- reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
- if (imageTexture2D)
- imageTexture2D(GL_TEXTURE_2D, image);
- else
- qCritical("No glEGLImageTargetTexture2DOES function available");
-
- // OpenGL 3.0 functions
- auto glContext = QOpenGLContext::currentContext();
- auto funcs = glContext->versionFunctions<QOpenGLFunctions_3_0>();
-
- // Bind framebuffer to copy pixels from
- GLuint framebuffer;
- funcs->glGenFramebuffers(1, &framebuffer);
- funcs->glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
- funcs->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
- const GLenum status = funcs->glCheckFramebufferStatus(GL_FRAMEBUFFER);
- if (status != GL_FRAMEBUFFER_COMPLETE) {
- qCritical("glCheckFramebufferStatus failed: %s", formatGLError(glGetError()));
- funcs->glDeleteTextures(1, &texture);
- funcs->glDeleteFramebuffers(1, &framebuffer);
- eglDestroyImage(display(), image);
- return;
- }
-
- // Capture to an image
- QImage capture(QSize(width, height), QImage::Format_RGBA8888);
- glViewport(0, 0, width, height);
- glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, capture.bits());
-
- // Post the event
- QCoreApplication::postEvent(QCoreApplication::instance(),
- new Liri::Platform::FrameCaptureEvent(capture));
-
- // Free resources
- funcs->glDeleteTextures(1, &texture);
- funcs->glDeleteFramebuffers(1, &framebuffer);
- eglDestroyImage(display(), image);
+ qWarning("Frame recording is not supported on embedded devices!");
}
void QEglFSKmsGbmScreen::pageFlipHandler(int fd, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, void *user_data)
--
2.20.1

View File

@@ -20,7 +20,10 @@ DEPENDS += " \
PV = "0.0.0+git${SRCPV}"
SRCREV = "7bbc508bc03ab0f6a6b1633b322a83db5d99ab5b"
SRC_URI += "file://0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch"
SRC_URI += " \
file://0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch \
file://0002-qeglfskmsgbmscreen-remove-frame-recording-completely.patch \
"
S = "${WORKDIR}/git"
FILES_${PN} += " \

View File

@@ -9,7 +9,7 @@ inherit liri
DEPENDS += "glib-2.0"
PV = "1.0.0+git${SRCPV}"
SRCREV = "3132cd4e46d8a2069594e36cb5be1eac36727a6a"
SRCREV = "0fc1cd016da9af9b198a174ea1c581b89c4bfbae"
S = "${WORKDIR}/git"
FILES_${PN} += "${OE_QMAKE_PATH_QML}"

View File

@@ -10,7 +10,7 @@ inherit liri pythonnative distro_features_check gsettings
REQUIRED_DISTRO_FEATURES = "wayland pam"
PV = "0.9.0+git${SRCPV}"
SRCREV = "bc130914550f2592f3d426beff54cb5cc6b30d5b"
SRCREV = "bc3fe24055efd5fc24e951fbe6f15ca93c6e8b9e"
S = "${WORKDIR}/git"
DEPENDS += " \

View File

@@ -0,0 +1,49 @@
From 7ac6c099cef0c106136437da76bb31d16f7d56f4 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Fri, 26 Apr 2019 13:23:34 +0000
Subject: [PATCH] HACK: fix wrongly included native QtCore/qconfig.h
For whatever reason the CPP includes qconfig.h from the native sysroot.
This causes QT_NO_WIDGETS to be true and as a result the following error
is thrown:
| .../0.14.1-r0/git/src/imageview.cpp: In member function 'void LxImage::ImageView::setSVG(const QString&)':
| .../0.14.1-r0/git/src/imageview.cpp:329:5: error: 'QGraphicsSvgItem' was not declared in this scope
| QGraphicsSvgItem *svgItem = new QGraphicsSvgItem(fileName);
| ^~~~~~~~~~~~~~~~
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
src/graphicsscene.h | 1 +
src/mainwindow.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/graphicsscene.h b/src/graphicsscene.h
index 79049f6..b2195f0 100644
--- a/src/graphicsscene.h
+++ b/src/graphicsscene.h
@@ -22,6 +22,7 @@
#define LXIMAGE_GRAPHICSSCENE_H
#include <QGraphicsScene>
+#undef QT_NO_WIDGETS
#include <QGraphicsSceneDragDropEvent>
namespace LxImage {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 3b13fc3..c72ed2b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -22,6 +22,7 @@
#define LXIMAGE_MAINWINDOW_H
#include <QMainWindow>
+#undef QT_NO_WIDGETS
#include "ui_mainwindow.h"
#include "imageview.h"
--
2.13.6

View File

@@ -8,6 +8,7 @@ inherit lxqt pkgconfig distro_features_check gtk-icon-cache mime
DEPENDS += "qtx11extras qtsvg libfm-qt libexif libxfixes"
SRC_URI += " file://0001-HACK-fix-wrongly-included-native-QtCore-qconfig.h.patch"
SRCREV = "6c2efe769d0514846c78e4a9147f3425440643ec"
PV = "0.14.1"

View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b"
inherit lxqt pkgconfig gtk-icon-cache
DEPENDS += "qtx11extras qttools"
DEPENDS += "libxrender qtx11extras qttools"
SRCREV = "f418b91afccffbed31744c1e23e220ad79985acf"
PV = "1.10.20"

View File

@@ -3,7 +3,6 @@ auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_permit.so
-auth optional pam_gnome_keyring.so
account include common-account

View File

@@ -10,8 +10,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
inherit cmake_qt5_extra qmake5_base pkgconfig systemd useradd distro_features_check
DEPENDS += "extra-cmake-modules-native qtbase qtdeclarative qttools libxcb"
# REVISIT optionals
DEPENDS += "libpam"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
PACKAGECONFIG[pam] = "-DENABLE_PAM=ON, -DENABLE_PAM=OFF, libpam"
# Note: we should check default config changes by running sddm --example-config on target.
# This is usually done during build but does not work for our cross environment
@@ -23,8 +24,8 @@ SRC_URI = " \
file://sddm-autologin.pam \
file://sddm.conf \
"
SRCREV = "c8867e02890502151a314c529348e9a42d0a061c"
PV = "0.18.0"
SRCREV = "de41b8ea555f2e42ba47d83530ad654ca708cf85"
PV = "0.18.1"
S = "${WORKDIR}/git"
@@ -38,17 +39,21 @@ do_configure_append() {
sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h
}
install_pam() {
install -d ${D}${sysconfdir}/pam.d
install -m 644 ${WORKDIR}/sddm.pam ${D}${sysconfdir}/pam.d/sddm
install -m 644 ${WORKDIR}/sddm-autologin.pam ${D}${sysconfdir}/pam.d/sddm-autologin
}
do_install_append() {
install -d ${D}/${sysconfdir}/sddm.conf.d
install -m 644 ${WORKDIR}/sddm.conf ${D}/${sysconfdir}/sddm.conf.d/00-default.conf
install -d ${D}${sysconfdir}/pam.d
install -m 644 ${WORKDIR}/sddm.pam ${D}${sysconfdir}/pam.d/sddm
install -m 644 ${WORKDIR}/sddm-autologin.pam ${D}${sysconfdir}/pam.d/sddm-autologin
install -d ${D}${localstatedir}/lib/sddm
chown -R sddm:sddm ${D}${localstatedir}/lib/sddm
chmod 0750 ${D}${localstatedir}/lib/sddm
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'install_pam', '', d)}
}
FILES_${PN} += "${OE_QMAKE_PATH_QML}"
@@ -69,7 +74,7 @@ RDEPENDS_${PN} += " \
qtbase-plugins \
qtdeclarative-plugins \
qtdeclarative-qmlplugins \
pam-plugin-tally \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-tally', '', d)} \
"
RRECOMMENDS_${PN += " \

View File

@@ -1,20 +0,0 @@
DESCRIPTION = "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok."
HOMEPAGE = "http://sigrok.org/wiki/Main_Page"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libsigrok qtbase qtsvg boost"
PACKAGECONFIG[decode] = "-DENABLE_DECODE=TRUE,-DENABLE_DECODE=FALSE,libsigrokdecode"
PACKAGECONFIG ??= "decode"
inherit cmake_qt5
SRC_URI = "http://sigrok.org/download/source/pulseview/pulseview-${PV}.tar.gz"
SRC_URI[md5sum] = "6056c6e42cc6eae094110cac2351558a"
SRC_URI[sha256sum] = "9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f"
FILES_${PN} += "${datadir}/*"

View File

@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/schnitzeltony/${BPN}.git;branch=master"
DEPENDS += "qtbase qtserialport"
PV = "0.3.994+git${SRCPV}"
SRCREV = "256024e70932966a626f011144dd1b37c1e65f59"
PV = "0.4.0+git${SRCPV}"
SRCREV = "00d534972a86a5c8db058131a0cbbdd496a66efb"
S="${WORKDIR}/git"

View File

@@ -0,0 +1,38 @@
From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 23 Oct 2016 22:46:43 +0200
Subject: [PATCH] use pkg-config to find freetype2
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@googlemail.com>
---
configure.ac | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 53560ea..b5bb6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup)
AC_PATH_X
-AC_CHECK_FT2([9.0.3],[],
- [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+PKG_CHECK_MODULES(FT2, freetype2,
+ CFLAGS="$CFLAGS $FT2_CFLAGS"
+ LIBS="$LIBS $FT2_LIBS",
+ AC_MSG_ERROR([FreeType2 is required to compile this library])
+)
+AC_SUBST([FT2_CFLAGS])
+AC_SUBST([FT2_LIBS])
AC_PATH_XTRA
--
2.5.5

View File

@@ -0,0 +1,36 @@
From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 23 Oct 2016 23:54:14 +0200
Subject: [PATCH] Makefile.am: remove useless and breaking code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile.am | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 89a8a7f..e582a34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,15 +24,6 @@ EXTRA_DIST = \
m4 \
$(NULL)
-# Print out an informative summary.
-all-local:
- @$(ECHO) "Done."
- @$(ECHO)
- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
- $(ECHO) "---" ;\
- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
- fi
- @$(ECHO)
# Upload documentation
DOC = docs/html docs/latex/ftgl.pdf
--
2.5.5

View File

@@ -0,0 +1,23 @@
SUMMARY = "OpenGL frontend to Freetype 2"
HOMEPAGE = "https://sourceforge.net/projects/ftgl/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4"
inherit autotools pkgconfig
DEPENDS += " \
freetype \
freeglut \
"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0001-use-pkg-config-to-find-freetype2.patch \
file://0002-Makefile.am-remove-useless-and-breaking-code.patch \
"
SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503"
SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59"
S = "${WORKDIR}/ftgl-2.1.3~rc5"
CFLAGS += "-lm"

View File

@@ -0,0 +1,38 @@
From d4e6aa415af0b3a836cbfb882a31e960e5e60246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 15 Mar 2019 21:14:10 +0100
Subject: [PATCH] Fix build with boost >= 1.69.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| In file included from ../src/headers/engine.h:73,
| from ../src/gx_head/engine/ladspaplugin.cpp:22:
| ../src/headers/gx_system.h:353:40: error: expected class-name before '{' token
| class BasicOptions: boost::noncopyable {
| ^
and more
Upstream-Status: Backport
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/headers/engine.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/headers/engine.h b/src/headers/engine.h
index 95f4497..2b6155e 100644
--- a/src/headers/engine.h
+++ b/src/headers/engine.h
@@ -39,6 +39,7 @@
#include <sys/stat.h>
#include <boost/format.hpp>
#include <boost/thread/mutex.hpp>
+#include <boost/core/noncopyable.hpp>
#include <glibmm/i18n.h> // NOLINT
#include <glibmm/optioncontext.h> // NOLINT
#include <glibmm/dispatcher.h>
--
2.20.1

View File

@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=384f45fb7968a0fe30622ce6160d3b69"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}2-${PV}.tar.xz \
file://0001-do-not-perform-link-test-durin-cross-build.patch \
file://0002-Fix-build-with-boost-1.69.0.patch \
"
SRC_URI[md5sum] = "78ebc879e5cd7a6e4bd43ff8aec562e1"
SRC_URI[sha256sum] = "4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1"

View File

@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.i-scream.org/libstatgrab/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "ftp://ftp.i-scream.org/pub/i-scream/${BPN}/${BPN}-${PV}.tar.gz"
SRC_URI = "https://ftp.i-scream.org/pub/i-scream/${BPN}/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "b906d312076ca9be3d5188edfe07f496"
SRC_URI[sha256sum] = "03e9328e4857c2c9dcc1b0347724ae4cd741a72ee11acc991784e8ef45b7f1ab"

View File

@@ -0,0 +1,18 @@
SUMMARY = "Library for caching application menus"
DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus"
HOMEPAGE = "http://lxde.sourceforge.net/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6"
SECTION = "x11/libs"
DEPENDS = "glib-2.0 libfm-extra"
SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz"
SRC_URI[md5sum] = "99999a0bca48b980105208760c8fd893"
SRC_URI[sha256sum] = "ed02eb459dcb398f69b9fa5bf4dd813020405afc84331115469cdf7be9273ec7"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/"
inherit autotools gettext pkgconfig gtk-doc