* [Buildroot] [PATCH 1/2] package/xscreensaver: fix build
@ 2023-07-16 17:01 Bernd Kuhls
2023-07-16 17:01 ` [Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06 Bernd Kuhls
2023-07-18 9:46 ` [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Thomas Petazzoni via buildroot
0 siblings, 2 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-07-16 17:01 UTC (permalink / raw)
To: buildroot; +Cc: Simon Dawson
Patch 0001 fixes the autobuilder error during configure.
Patch 0002 fixes another bug while building the package.
Fixes:
http://autobuild.buildroot.net/results/845/84575eec1d4226c46ac96bfc98963f38fa75a762/
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
.checkpackageignore | 2 +
.../0001-disable-check-for-pam.patch | 16 +++++
.../0002-build-Do-not-build-po-files.patch | 58 +++++++++++++++++++
package/xscreensaver/xscreensaver.mk | 10 ++++
4 files changed, 86 insertions(+)
create mode 100644 package/xscreensaver/0001-disable-check-for-pam.patch
create mode 100644 package/xscreensaver/0002-build-Do-not-build-po-files.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 504b96951b..fa557733e8 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
package/xl2tp/xl2tpd TrailingSpace
package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream
+package/xscreensaver/0001-disable-check-for-pam.patch
+package/xscreensaver/0002-build-Do-not-build-po-files.patch
package/xxhash/0001-fix-man-page-installation.patch Upstream
package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream
package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream
diff --git a/package/xscreensaver/0001-disable-check-for-pam.patch b/package/xscreensaver/0001-disable-check-for-pam.patch
new file mode 100644
index 0000000000..6d052a53e9
--- /dev/null
+++ b/package/xscreensaver/0001-disable-check-for-pam.patch
@@ -0,0 +1,16 @@
+Fix cross-build
+
+Detecting features of the host does not make sense when cross-compiling.
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+
+--- a/configure.ac.orig 2022-02-20 22:05:40.029817049 +0100
++++ b/configure.ac 2023-07-16 14:32:57.562198378 +0200
+@@ -4802,7 +4802,6 @@
+ if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+ warn "Your system seems to have PAM, but PAM is not being used."
+ warn2 "That is probably not going to work out well."
+- CONF_STATUS=1
+ fi
+ fi
+
diff --git a/package/xscreensaver/0002-build-Do-not-build-po-files.patch b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
new file mode 100644
index 0000000000..03674f5d50
--- /dev/null
+++ b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
@@ -0,0 +1,58 @@
+From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 16 Jul 2022 09:59:40 -0700
+Subject: [PATCH 2/2] build: Do not build po files
+
+Fixes
+| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po'
+| make[1]: *** No rule to make target 'default'. Stop.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Downloaded from
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ Makefile.in | 5 ++---
+ driver/Makefile.in | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9de79b2..1c1d16c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,8 +6,8 @@ srcdir = @srcdir@
+ VPATH = @srcdir@
+
+ SHELL = /bin/sh
+-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \
+- driver po
++SUBDIRS = utils jwxyz hacks/images hacks hacks/fonts \
++ driver
+ SUBDIRS2 = $(SUBDIRS) OSX android
+ TARFILES = README README.hacking INSTALL \
+ configure configure.ac Makefile.in config.h.in \
+@@ -461,4 +461,3 @@ cerebrum::
+ --include 'ad2c' \
+ --include '*/' \
+ --exclude '*'
+-
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index e1fa1b2..feca6fc 100644
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -211,7 +211,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \
+ xdpyinfo test-screens test-yarandom test-xinput \
+ test-xkb
+
+-EXES = xscreensaver xscreensaver-command xscreensaver-settings
++EXES = xscreensaver xscreensaver-command
+ UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES = xscreensaver-auth
+ DEMO_EXES = @ALL_DEMO_PROGRAMS@
+--
+2.37.1
+
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 6cc7e8febe..fed25925cc 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -13,6 +13,16 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project
XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver
+# 0001-disable-check-for-pam.patch
+# 0002-build-Do-not-build-po-files.patch
+XSCREENSAVER_AUTORECONF = YES
+
+# fix missing config.rpath (needed for autoreconf) in the codebase
+define XSCREENSAVER_TOUCH_CONFIG_RPATH
+ touch $(@D)/config.rpath
+endef
+XSCREENSAVER_PRE_CONFIGURE_HOOKS += XSCREENSAVER_TOUCH_CONFIG_RPATH
+
XSCREENSAVER_DEPENDENCIES = \
gdk-pixbuf \
gdk-pixbuf-xlib \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06
2023-07-16 17:01 [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Bernd Kuhls
@ 2023-07-16 17:01 ` Bernd Kuhls
2023-07-18 9:46 ` [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Thomas Petazzoni via buildroot
1 sibling, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2023-07-16 17:01 UTC (permalink / raw)
To: buildroot; +Cc: Simon Dawson
Add more patches to fix build errors.
Changelog: https://www.jwz.org/xscreensaver/changelog.html
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
.checkpackageignore | 2 +
...disable-failure-ac_unrecognized_opts.patch | 17 +++++++
...-CONF_STATUS-for-gtk-and-openGL-need.patch | 45 +++++++++++++++++++
package/xscreensaver/xscreensaver.hash | 2 +-
package/xscreensaver/xscreensaver.mk | 2 +-
5 files changed, 66 insertions(+), 2 deletions(-)
create mode 100644 package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
create mode 100644 package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index fa557733e8..3ed92ded10 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1640,6 +1640,8 @@ package/xl2tp/xl2tpd TrailingSpace
package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream
package/xscreensaver/0001-disable-check-for-pam.patch
package/xscreensaver/0002-build-Do-not-build-po-files.patch
+package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
+package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
package/xxhash/0001-fix-man-page-installation.patch Upstream
package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream
package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream
diff --git a/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch b/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
new file mode 100644
index 0000000000..1fe9695c19
--- /dev/null
+++ b/package/xscreensaver/0003-disable-failure-ac_unrecognized_opts.patch
@@ -0,0 +1,17 @@
+Do not return an error code when unrecognized configure options are used.
+
+Inspired by
+https://github.com/OpenMandrivaAssociation/xscreensaver/blob/master/xscreensaver.spec#L124
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+
+--- a/configure.ac.orig 2023-07-16 14:51:57.982072603 +0200
++++ b/configure.ac 2023-07-16 15:35:13.616281941 +0200
+@@ -22,7 +22,6 @@
+
+ if ! test -z "$ac_unrecognized_opts" ; then
+ echo "" >&2
+- exit 2
+ fi
+
+ ###############################################################################
diff --git a/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
new file mode 100644
index 0000000000..d153f39a76
--- /dev/null
+++ b/package/xscreensaver/0004-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
@@ -0,0 +1,45 @@
+From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 17 Jul 2022 09:47:35 -0700
+Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs
+
+These are just warnings
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Downloaded from
+https://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
+
+[Bernd: rebased for 6.06]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4fd38f..d7463cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+- CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then
+ CONF_STATUS=1
+ elif test "$with_gl_req" = no ; then
+ noteL 'The OpenGL 3D library is not being used.'
+- CONF_STATUS=1
+ else
+ noteL 'The OpenGL 3D library was not found.'
+- CONF_STATUS=1
+ fi
+
+ if test "$gl_halfassed" = yes ; then
+--
+2.37.1
+
diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash
index 27ef7d8f00..db0a410bfc 100644
--- a/package/xscreensaver/xscreensaver.hash
+++ b/package/xscreensaver/xscreensaver.hash
@@ -1,4 +1,4 @@
# Locally calculated
-sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz
+sha256 f534fab85a836de5b8be8e91fc21b80ca7d6a4ed9386ebe207d4be7a4e7499a7 xscreensaver-6.06.tar.gz
sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h
sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index fed25925cc..c0abade508 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XSCREENSAVER_VERSION = 6.03
+XSCREENSAVER_VERSION = 6.06
XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
# N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/xscreensaver: fix build
2023-07-16 17:01 [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Bernd Kuhls
2023-07-16 17:01 ` [Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06 Bernd Kuhls
@ 2023-07-18 9:46 ` Thomas Petazzoni via buildroot
2023-07-31 22:41 ` Thomas Petazzoni via buildroot
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-18 9:46 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Simon Dawson, buildroot
Hello Bernd,
On Sun, 16 Jul 2023 19:01:25 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 504b96951b..fa557733e8 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
> package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
> package/xl2tp/xl2tpd TrailingSpace
> package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream
> +package/xscreensaver/0001-disable-check-for-pam.patch
> +package/xscreensaver/0002-build-Do-not-build-po-files.patch
Is this valid syntax? You're saying to ignore some warnings, but not
which ones.
Also, for new patches, adding them in the checkpackageignore file is
quite odd. We definitely want those new patches to have an "Upstream:"
tag.
> package/xxhash/0001-fix-man-page-installation.patch Upstream
> package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream
> package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream
> diff --git a/package/xscreensaver/0001-disable-check-for-pam.patch b/package/xscreensaver/0001-disable-check-for-pam.patch
> new file mode 100644
> index 0000000000..6d052a53e9
> --- /dev/null
> +++ b/package/xscreensaver/0001-disable-check-for-pam.patch
> @@ -0,0 +1,16 @@
> +Fix cross-build
> +
> +Detecting features of the host does not make sense when cross-compiling.
> +
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Meh, no Git repository of the project to have a nice Git formatted patch? :-/
> diff --git a/package/xscreensaver/0002-build-Do-not-build-po-files.patch b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
> new file mode 100644
> index 0000000000..03674f5d50
> --- /dev/null
> +++ b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
> @@ -0,0 +1,58 @@
> +From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sat, 16 Jul 2022 09:59:40 -0700
> +Subject: [PATCH 2/2] build: Do not build po files
No patch numbering, this raises a check-package warning.
I see Khem has been able to generate a git formatted patch, I wonder
against which Git repository?
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/xscreensaver: fix build
2023-07-18 9:46 ` [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Thomas Petazzoni via buildroot
@ 2023-07-31 22:41 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-31 22:41 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Simon Dawson, Thomas Petazzoni via buildroot
Hello Bernd,
Do you think you could follow-up on the below comments? It would help
getting the patch merged.
Thanks!
Thomas
On Tue, 18 Jul 2023 11:46:08 +0200
Thomas Petazzoni via buildroot <buildroot@buildroot.org> wrote:
> Hello Bernd,
>
> On Sun, 16 Jul 2023 19:01:25 +0200
> Bernd Kuhls <bernd@kuhls.net> wrote:
>
> > diff --git a/.checkpackageignore b/.checkpackageignore
> > index 504b96951b..fa557733e8 100644
> > --- a/.checkpackageignore
> > +++ b/.checkpackageignore
> > @@ -1638,6 +1638,8 @@ package/xinetd/0004-configure-rlim_t.patch Upstream
> > package/xinetd/0005-CVE-2013-4342-xinetd-ignores-user-and-group-directiv.patch Upstream
> > package/xl2tp/xl2tpd TrailingSpace
> > package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch Upstream
> > +package/xscreensaver/0001-disable-check-for-pam.patch
> > +package/xscreensaver/0002-build-Do-not-build-po-files.patch
>
> Is this valid syntax? You're saying to ignore some warnings, but not
> which ones.
>
> Also, for new patches, adding them in the checkpackageignore file is
> quite odd. We definitely want those new patches to have an "Upstream:"
> tag.
>
> > package/xxhash/0001-fix-man-page-installation.patch Upstream
> > package/xxhash/0002-Makefile-add-dedicated-install-targets.patch Upstream
> > package/xxhash/0003-do-no-longer-depend-on-assert-h-for-XXH_STATIC_ASSERT.patch Upstream
> > diff --git a/package/xscreensaver/0001-disable-check-for-pam.patch b/package/xscreensaver/0001-disable-check-for-pam.patch
> > new file mode 100644
> > index 0000000000..6d052a53e9
> > --- /dev/null
> > +++ b/package/xscreensaver/0001-disable-check-for-pam.patch
> > @@ -0,0 +1,16 @@
> > +Fix cross-build
> > +
> > +Detecting features of the host does not make sense when cross-compiling.
> > +
> > +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>
> Meh, no Git repository of the project to have a nice Git formatted patch? :-/
>
> > diff --git a/package/xscreensaver/0002-build-Do-not-build-po-files.patch b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
> > new file mode 100644
> > index 0000000000..03674f5d50
> > --- /dev/null
> > +++ b/package/xscreensaver/0002-build-Do-not-build-po-files.patch
> > @@ -0,0 +1,58 @@
> > +From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
> > +From: Khem Raj <raj.khem@gmail.com>
> > +Date: Sat, 16 Jul 2022 09:59:40 -0700
> > +Subject: [PATCH 2/2] build: Do not build po files
>
> No patch numbering, this raises a check-package warning.
>
> I see Khem has been able to generate a git formatted patch, I wonder
> against which Git repository?
>
> Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-31 22:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-16 17:01 [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Bernd Kuhls
2023-07-16 17:01 ` [Buildroot] [PATCH 2/2] package/xscreensaver: bump version to 6.06 Bernd Kuhls
2023-07-18 9:46 ` [Buildroot] [PATCH 1/2] package/xscreensaver: fix build Thomas Petazzoni via buildroot
2023-07-31 22:41 ` Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox