hartwork · Feb 14, 2023 · Feb 5, 2023 · Feb 13, 2023 · Feb 14, 2023
diff --git a/.github/workflows/enforce-copies-of-help-output-in-sync.yml b/.github/workflows/enforce-copies-of-help-output-in-sync.yml
@@ -35,6 +35,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install --yes --no-install-recommends \
+            autoconf-archive \
             autopoint \
             gettext \
             help2man \

diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml
@@ -65,6 +65,7 @@ jobs:
           #       >                             is to be installed
           sudo apt-get install --yes --no-install-recommends libunwind-dev
           sudo apt-get install --yes --no-install-recommends \
+            autoconf-archive \
             autopoint \
             bison \
             doxygen \
@@ -93,6 +94,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |-
           brew install \
+            autoconf-archive \
             automake \
             bison \
             doxygen \
@@ -104,8 +106,6 @@ jobs:
             jack \
             libpng \
             luajit \
-            mesa \
-            mesa-glu \
             orc \
             pkg-config \
             portaudio \

diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
@@ -23,6 +23,7 @@ jobs:
           #       >                             is to be installed
           sudo apt-get install --yes --no-install-recommends libunwind-dev
           sudo apt-get install --yes --no-install-recommends \
+            autoconf-archive \
             autopoint \
             bison \
             doxygen \

diff --git a/libvisual-plugins/configure.ac b/libvisual-plugins/configure.ac
@@ -180,16 +180,16 @@ if test "$ENABLE_GSTREAMER_PLUGIN" = "yes"; then
   fi
 fi
 
-dnl OpenGL + GLX
+dnl OpenGL + GLU
 AC_ARG_ENABLE([opengl],
   AS_HELP_STRING([--disable-opengl],
     [Do not build actor plugins based using OpenGL/GLU @<:@default=enabled@:>@]),
   [ENABLE_OPENGL_ACTORS=$enableval],
   [ENABLE_OPENGL_ACTORS=yes])
 
 AS_IF([test "$ENABLE_OPENGL_ACTORS" = "yes"], [
-  PKG_CHECK_MODULES([GL], [gl], [HAVE_OPENGL="yes"], [HAVE_OPENGL="no"])
-  PKG_CHECK_MODULES([GLU], [glu], [HAVE_GLU="yes"], [HAVE_GLU="no"; HAVE_OPENGL="no"])
+  AX_CHECK_GL([HAVE_OPENGL="yes"], [HAVE_OPENGL="no"])
+  AX_CHECK_GLU([HAVE_GLU="yes"], [HAVE_GLU="no"; HAVE_OPENGL="no"])
   AS_IF([test "$HAVE_OPENGL" != "yes"], [
     AC_MSG_WARN([*** OpenGL and/or GLU have not been found, see above.
                         Actor plugins using OpenGL will not be built.])

diff --git a/libvisual-plugins/plugins/actor/dancingparticles/actor_dancingparticles.cpp b/libvisual-plugins/plugins/actor/dancingparticles/actor_dancingparticles.cpp
@@ -31,8 +31,21 @@
 #include <math.h>
 #include <gettext.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include "gl.h"
 #include "fastmath.h"

diff --git a/libvisual-plugins/plugins/actor/dancingparticles/etoile.h b/libvisual-plugins/plugins/actor/dancingparticles/etoile.h
@@ -1,5 +1,13 @@
 #include <cmath>
-#include <GL/glu.h>
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
+
 #include <cstring>
 #include <iostream>
 

diff --git a/libvisual-plugins/plugins/actor/dancingparticles/floatpoint.h b/libvisual-plugins/plugins/actor/dancingparticles/floatpoint.h
@@ -2,7 +2,15 @@
 #define FLOATPOINT_HH
 
 #include <iostream>
-#include <GL/gl.h>
+
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
 using namespace std;
 
 #define myfloat  GLfloat

diff --git a/libvisual-plugins/plugins/actor/lv_gltest/actor_lv_gltest.c b/libvisual-plugins/plugins/actor/lv_gltest/actor_lv_gltest.c
@@ -33,8 +33,21 @@
 #include <math.h>
 #include <gettext.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include <libvisual/libvisual.h>
 

diff --git a/libvisual-plugins/plugins/actor/madspin/madspin.c b/libvisual-plugins/plugins/actor/madspin/madspin.c
@@ -34,8 +34,13 @@
 
 #include <time.h>
 
-#include <GL/gl.h>
-/*#include <GL/glu.h>*/
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
 
 #include <libvisual/libvisual.h>
 

diff --git a/libvisual-plugins/plugins/actor/nastyfft/actor_nastyfft.c b/libvisual-plugins/plugins/actor/nastyfft/actor_nastyfft.c
@@ -18,15 +18,30 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <math.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include <gettext.h>
 

diff --git a/libvisual-plugins/plugins/actor/nebulus/child_data.c b/libvisual-plugins/plugins/actor/nebulus/child_data.c
@@ -1,4 +1,10 @@
-#include <GL/gl.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
 
 GLuint childNormals = 6153;
 

diff --git a/libvisual-plugins/plugins/actor/nebulus/face_data.c b/libvisual-plugins/plugins/actor/nebulus/face_data.c
@@ -1,4 +1,10 @@
-#include <GL/gl.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
 
 GLuint numVertices = 473;
 GLuint numNormals = 537;

diff --git a/libvisual-plugins/plugins/actor/nebulus/nebulus.h b/libvisual-plugins/plugins/actor/nebulus/nebulus.h
@@ -2,8 +2,22 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
+
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include <libvisual/libvisual.h>
 

diff --git a/libvisual-plugins/plugins/actor/pseudotoad_flower/actor_flower.c b/libvisual-plugins/plugins/actor/pseudotoad_flower/actor_flower.c
@@ -32,8 +32,21 @@
 #include <math.h>
 #include <gettext.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include <libvisual/libvisual.h>
 

diff --git a/libvisual-plugins/plugins/actor/pseudotoad_flower/main.c b/libvisual-plugins/plugins/actor/pseudotoad_flower/main.c
@@ -22,12 +22,27 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef HAVE_GL_GL_H
+# include <GL/gl.h>
+#elif defined(HAVE_OPENGL_GL_H)
+# include <OpenGL/gl.h>
+#else
+# error neither GL/gl.h nor OpenGL/gl.h available
+#endif
+
+#if defined(HAVE_GL_GLU_H)
+# include <GL/glu.h>
+#elif defined(HAVE_OPENGL_GLU_H)
+# include <OpenGL/glu.h>
+#else
+# error neither GL/glu.h nor OpenGL/glu.h available
+#endif
 
 #include "main.h"
 

diff --git a/libvisual-plugins/po/de.po b/libvisual-plugins/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libvisual-plugins 0.4.0\n"
 "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
-"POT-Creation-Date: 2023-02-14 16:36+0100\n"
+"POT-Creation-Date: 2023-02-14 16:48+0100\n"
 "PO-Revision-Date: 2017-11-23 18:08:07+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -293,24 +293,24 @@ msgstr "Libvisual-Analyseerweiterung"
 msgid "A nice simple spectrum analyzer plugin."
 msgstr "eine schicke einfache Spektrumanalyseerweiterung"
 
-#: plugins/actor/lv_gltest/actor_lv_gltest.c:92
+#: plugins/actor/lv_gltest/actor_lv_gltest.c:105
 msgid ""
 "Original by:  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front "
 "Technologies, Port by: Dennis Smit <ds@nerds-incorporated.org>"
 msgstr ""
 "Original von: Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson und 4Front "
 "Technologies, Portierung durch: Dennis Smit <ds@nerds-incorporated.org>"
 
-#: plugins/actor/lv_gltest/actor_lv_gltest.c:94
+#: plugins/actor/lv_gltest/actor_lv_gltest.c:107
 msgid "Libvisual GL analyzer plugin"
 msgstr "Libvisual-GL-Analysiererweiterung"
 
-#: plugins/actor/lv_gltest/actor_lv_gltest.c:95
+#: plugins/actor/lv_gltest/actor_lv_gltest.c:108
 msgid "This plugin shows an openGL bar analyzer like the xmms one"
 msgstr "Diese Erweiterung zeigt ein OpenGL-Balkenanalyse wie die von XMMS."
 
 # FIXME s/Transparant/Transparent/
-#: plugins/actor/lv_gltest/actor_lv_gltest.c:141
+#: plugins/actor/lv_gltest/actor_lv_gltest.c:154
 msgid "Transparant bars"
 msgstr "durchsichtige Balken"
 
@@ -323,44 +323,44 @@ msgid "This is a test plugin that'll display a simple scope"
 msgstr ""
 "Dies ist eine Testerweiterung, die eine einfache Bandbreite anzeigen wird."
 
-#: plugins/actor/madspin/madspin.c:97
+#: plugins/actor/madspin/madspin.c:102
 msgid ""
 "Original by: Andrew Birck <birck@uiuc.edu>, Port by: Dennis Smit <ds@nerds-"
 "incorporated.org>"
 msgstr ""
 "Original von: Andrew Birck <birck@uiuc.edu>, Portierung durch: Dennis Smit "
 "<ds@nerds-incorporated.org>"
 
-#: plugins/actor/madspin/madspin.c:99
+#: plugins/actor/madspin/madspin.c:104
 msgid "Libvisual madspin plugin"
 msgstr "Libvisual-Madspin-Erweiterung"
 
-#: plugins/actor/madspin/madspin.c:100
+#: plugins/actor/madspin/madspin.c:105
 msgid "This plugin shows a nifty visual effect using openGL"
 msgstr ""
 "Diese Erweiterung zeigt einen eleganten optischen Effekt mittels OpenGL."
 
-#: plugins/actor/madspin/madspin.c:164
+#: plugins/actor/madspin/madspin.c:169
 msgid "Number of stars:"
 msgstr "Anzahl der Sterne:"
 
-#: plugins/actor/madspin/madspin.c:165
+#: plugins/actor/madspin/madspin.c:170
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: plugins/actor/pseudotoad_flower/actor_flower.c:78
+#: plugins/actor/pseudotoad_flower/actor_flower.c:91
 msgid ""
 "Original by: Antti Silvast <asilvast@iki.fi>, Port by: Dennis Smit <ds@nerds-"
 "incorporated.org>"
 msgstr ""
 "Original von: Antti Silvast <asilvast@iki.fi>, Portierung durch: Dennis Smit "
 "<ds@nerds-incorporated.org>"
 
-#: plugins/actor/pseudotoad_flower/actor_flower.c:80
+#: plugins/actor/pseudotoad_flower/actor_flower.c:93
 msgid "Libvisual yellow rose of texas port"
 msgstr "gelbe Rose von Texas-Portierung von Libvisual"
 
-#: plugins/actor/pseudotoad_flower/actor_flower.c:81
+#: plugins/actor/pseudotoad_flower/actor_flower.c:94
 msgid "This renders an awesome responsive flower"
 msgstr "Dies berechnet eine tolle ansprechende Blume"