Control: tags 951921 + patch
Control: tags 951921 + pending
Dear maintainer,
I've prepared an NMU for vdr-plugin-xineliboutput (versioned as
2.1.0+git20191101-1.1) and uploaded it to DELAYED/1. Please feel
free to tell me if I should cancel it.
cu
Adrian
diff -Nru vdr-plugin-xineliboutput-2.1.0+git20191101/debian/changelog vdr-plugin-xineliboutput-2.1.0+git20191101/debian/changelog
--- vdr-plugin-xineliboutput-2.1.0+git20191101/debian/changelog 2019-11-01 16:36:57.000000000 +0200
+++ vdr-plugin-xineliboutput-2.1.0+git20191101/debian/changelog 2021-02-05 09:21:31.000000000 +0200
@@ -1,3 +1,10 @@
+vdr-plugin-xineliboutput (2.1.0+git20191101-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream fix for GLX FTBFS. (Closes: #951921)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 05 Feb 2021 09:21:31 +0200
+
vdr-plugin-xineliboutput (2.1.0+git20191101-1) unstable; urgency=medium
* New Upstream Snapshot (commit 32a5ffc)
diff -Nru vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/0001-configure-fix-GLX-check-when-using-pkg-config.patch vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/0001-configure-fix-GLX-check-when-using-pkg-config.patch
--- vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/0001-configure-fix-GLX-check-when-using-pkg-config.patch 1970-01-01 02:00:00.000000000 +0200
+++ vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/0001-configure-fix-GLX-check-when-using-pkg-config.patch 2021-02-05 09:17:14.000000000 +0200
@@ -0,0 +1,42 @@
+From 21df3eed9745333c19f175b707df7da0963391c5 Mon Sep 17 00:00:00 2001
+From: Petri Hintukainen <phint...@gmail.com>
+Date: Thu, 2 Jul 2020 21:48:36 +0300
+Subject: configure: fix GLX check (when using pkg-config)
+
+---
+ configure | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index b1138bb..1a443fd 100755
+--- a/configure
++++ b/configure
+@@ -238,6 +238,7 @@ FEATURES="
+ xrender
+ xshape
+ opengl
++ glx
+ pthread
+ dlfcn
+ vdpau
+@@ -345,6 +346,7 @@ check_deps(){
+ disabled vdr && disable libextractor libcap libbluray avahi-client
+ disabled dlfcn && disable opengl
+ disabled pthread && disable opengl
++ disabled glx && disable opengl
+ disabled xrender && disable xshape xshm
+ }
+
+@@ -401,7 +403,8 @@ if enabled libxine; then
+ test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)"
+ test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)"
+ test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)"
+- test_library X11 opengl "GL/glx.h" "-lGL -lGLU" "glXQueryVersion(0,0,0)"
++ test_library X11 opengl "GL/gl.h" "-lGL -lGLU" "glTexCoord2f(0.0,0.0)"
++ test_library X11 glx "GL/glx.h" "-lGLX" "glXQueryVersion(0,0,0)"
+ test_library none vdpau "vdpau/vdpau_x11.h" "-lvdpau" "vdp_device_create_x11(0,0,0,0)"
+ test_library X11 dbus-glib-1 \
+ "dbus/dbus-glib.h" \
+--
+2.20.1
+
diff -Nru vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/series vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/series
--- vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/series 2019-11-01 16:36:57.000000000 +0200
+++ vdr-plugin-xineliboutput-2.1.0+git20191101/debian/patches/series 2021-02-05 09:21:30.000000000 +0200
@@ -1 +1,2 @@
disable-po-update.patch
+0001-configure-fix-GLX-check-when-using-pkg-config.patch
