Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Mangohud and its dependencies #503

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+656 −0
Open

Add Mangohud and its dependencies #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d741ea
glew: Add at 2.2.0
philmmanjaro Dec 31, 2024
fcc8b73
glfw: Add at 3.4
philmmanjaro Dec 31, 2024
0a12bd4
nlohmann-json: Add at 3.11.3
philmmanjaro Dec 31, 2024
0f1d7a9
mangohud: Add at 0.7.2
philmmanjaro Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added g/glew/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
68 changes: 68 additions & 0 deletions g/glew/manifest.x86_64.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/** Human readable report. This is not consumed by boulder */
{
"manifest-version": "0.2",
"packages": {
"glew": {
"build-depends": [
"binary(cc)",
"pkgconfig(egl)",
"pkgconfig(gl)",
"pkgconfig(glu)",
"pkgconfig(x11)"
],
"depends": [
"interpreter(/usr/lib/ld-linux-x86-64.so.2(x86_64))",
"soname(libEGL.so.1(x86_64))",
"soname(libGL.so.1(x86_64))",
"soname(libX11.so.6(x86_64))",
"soname(libc.so.6(x86_64))"
],
"files": [
"/usr/bin/eglewinfo",
"/usr/bin/glewinfo",
"/usr/bin/glxewinfo",
"/usr/bin/visualinfo",
"/usr/lib/libGLEW.so.2.2",
"/usr/lib/libGLEW.so.2.2.0",
"/usr/share/licenses/glew/LICENSE"
],
"name": "glew",
"provides": [
"binary(eglewinfo)",
"binary(glewinfo)",
"binary(glxewinfo)",
"binary(visualinfo)",
"soname(libGLEW.so.2.2(x86_64))"
]
},
"glew-devel": {
"build-depends": [
"binary(cc)",
"pkgconfig(egl)",
"pkgconfig(gl)",
"pkgconfig(glu)",
"pkgconfig(x11)"
],
"depends": [
"glew",
"pkgconfig(glu)"
],
"files": [
"/usr/include/GL/eglew.h",
"/usr/include/GL/glew.h",
"/usr/include/GL/glxew.h",
"/usr/include/GL/wglew.h",
"/usr/lib/libGLEW.a",
"/usr/lib/libGLEW.so",
"/usr/lib/pkgconfig/glew.pc"
],
"name": "glew-devel",
"provides": [
"pkgconfig(glew)"
]
}
},
"source-name": "glew",
"source-release": "1",
"source-version": "2.2.0"
}
168 changes: 168 additions & 0 deletions g/glew/pkg/egl+glx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
--- a/src/glew.c
+++ b/src/glew.c
@@ -36,11 +36,13 @@
# include GLEW_INCLUDE
#endif

+#if defined(GLEW_EGL)
+# include <GL/eglew.h>
+#endif
+
#if defined(GLEW_OSMESA)
# define GLAPI extern
# include <GL/osmesa.h>
-#elif defined(GLEW_EGL)
-# include <GL/eglew.h>
#elif defined(_WIN32)
/*
* If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
@@ -57,8 +59,7 @@

#include <stddef.h> /* For size_t */

-#if defined(GLEW_EGL)
-#elif defined(GLEW_REGAL)
+#if defined(GLEW_REGAL)

/* In GLEW_REGAL mode we call direcly into the linked
libRegal.so glGetProcAddressREGAL for looking up
@@ -159,23 +160,37 @@
* Define glewGetProcAddress.
*/
#if defined(GLEW_REGAL)
-# define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
+# define _glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
#elif defined(GLEW_OSMESA)
-# define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
-#elif defined(GLEW_EGL)
-# define glewGetProcAddress(name) eglGetProcAddress((const char *)name)
+# define _glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
#elif defined(_WIN32)
-# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+# define _glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
-# define glewGetProcAddress(name) NSGLGetProcAddress(name)
+# define _glewGetProcAddress(name) NSGLGetProcAddress(name)
#elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)
-# define glewGetProcAddress(name) dlGetProcAddress(name)
+# define _glewGetProcAddress(name) dlGetProcAddress(name)
#elif defined(__ANDROID__)
-# define glewGetProcAddress(name) NULL /* TODO */
+# define _glewGetProcAddress(name) NULL /* TODO */
#elif defined(__native_client__)
-# define glewGetProcAddress(name) NULL /* TODO */
+# define _glewGetProcAddress(name) NULL /* TODO */
#else /* __linux */
-# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
+# define _glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
+#endif
+
+#if defined(GLEW_EGL)
+static GLboolean _EGL_available = GL_FALSE;
+static void (*glewGetProcAddress (const GLubyte *name)) (void)
+{
+ void (*addr)(void);
+ if (_EGL_available)
+ {
+ addr = eglGetProcAddress((const char *)name);
+ if (addr) return addr;
+ }
+ return _glewGetProcAddress(name);
+}
+#else
+# define glewGetProcAddress(name) _glewGetProcAddress(name)
#endif

/*
@@ -19297,9 +19312,7 @@
}


-#if defined(GLEW_OSMESA)
-
-#elif defined(GLEW_EGL)
+#if defined(GLEW_EGL)

PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL;
PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL;
@@ -20490,8 +20503,8 @@
PFNEGLQUERYSTRINGPROC queryString = NULL;

/* Load necessary entry points */
- initialize = (PFNEGLINITIALIZEPROC) glewGetProcAddress("eglInitialize");
- queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString");
+ initialize = (PFNEGLINITIALIZEPROC) eglGetProcAddress("eglInitialize");
+ queryString = (PFNEGLQUERYSTRINGPROC) eglGetProcAddress("eglQueryString");
if (!initialize || !queryString)
return 1;

@@ -21029,7 +21042,9 @@
return GLEW_OK;
}

-#elif defined(_WIN32)
+#endif
+
+#if defined(_WIN32)

PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;

@@ -23105,13 +23120,26 @@
GLenum r;
#if defined(GLEW_EGL)
PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL;
+ EGLDisplay display;
#endif
r = glewContextInit();
if ( r != 0 ) return r;
#if defined(GLEW_EGL)
- getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay");
- return eglewInit(getCurrentDisplay());
-#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
+ getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) eglGetProcAddress("eglGetCurrentDisplay");
+ if (getCurrentDisplay)
+ display = getCurrentDisplay();
+ else
+ display = EGL_NO_DISPLAY;
+ if (display != EGL_NO_DISPLAY)
+ {
+ r = eglewInit(display);
+ if ( r == 0 ) {
+ _EGL_available = GL_TRUE;
+ return r;
+ }
+ }
+#endif
+#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
return r;
#elif defined(_WIN32)
return wglewInit();
@@ -29785,7 +29813,7 @@
return ret;
}

-#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA)
+#if defined(_WIN32) && !defined(GLEW_OSMESA)

GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
{
@@ -30228,7 +30256,7 @@
return ret;
}

-#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)

GLboolean glxewIsSupported (const char* name)
{
@@ -30805,7 +30833,9 @@
return ret;
}

-#elif defined(GLEW_EGL)
+#endif
+
+#if defined(GLEW_EGL)

GLboolean eglewIsSupported (const char* name)
{
73 changes: 73 additions & 0 deletions g/glew/pkg/glew-install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
--- glew-2.2.0/Makefile 2020-03-15 12:53:59.000000000 +0100
+++ glew-2.2.0/Makefile 2020-04-17 11:51:25.568482195 +0200
@@ -120,7 +120,7 @@
endif

$(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS)
- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
+ $(LD) $(LDFLAGS.SO) $(LDFLAGS) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
ifneq ($(LN),)
$(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.SONAME)
$(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.DEVLNK)
@@ -131,11 +131,11 @@

tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
@mkdir -p $(dir $@)
- $(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ $(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $<

tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
@mkdir -p $(dir $@)
- $(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ $(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $<

# Force re-write of glew.pc, GLEW_DEST can vary

@@ -180,13 +180,13 @@
mkdir bin

bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
ifneq ($(STRIP),)
$(STRIP) -x $@
endif

bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
ifneq ($(STRIP),)
$(STRIP) -x $@
endif
@@ -193,11 +193,11 @@

$(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
@mkdir -p $(dir $@)
- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $<

$(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
@mkdir -p $(dir $@)
- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $<

# Install targets

--- glew-2.1.0/Makefile.install 2018-08-15 13:51:45.220637107 +0200
+++ glew-2.1.0/Makefile 2018-08-15 13:52:02.168740876 +0200
@@ -231,6 +231,7 @@ install.bin: glew.bin

install.include:
$(INSTALL) -d -m 0755 "$(DESTDIR)$(INCDIR)"
+ $(INSTALL) -m 0644 include/GL/eglew.h "$(DESTDIR)$(INCDIR)/"
$(INSTALL) -m 0644 include/GL/wglew.h "$(DESTDIR)$(INCDIR)/"
$(INSTALL) -m 0644 include/GL/glew.h "$(DESTDIR)$(INCDIR)/"
$(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/"
@@ -241,6 +242,7 @@ install.pkgconfig: glew.pc
$(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(PKGDIR)/"

uninstall:
+ $(RM) "$(DESTDIR)$(INCDIR)/eglew.h"
$(RM) "$(DESTDIR)$(INCDIR)/wglew.h"
$(RM) "$(DESTDIR)$(INCDIR)/glew.h"
$(RM) "$(DESTDIR)$(INCDIR)/glxew.h"
45 changes: 45 additions & 0 deletions g/glew/stone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#

Check failure on line 1 in g/glew/stone.yaml

View workflow job for this annotation

GitHub Actions / Checks 

`monitoring.yaml` is missing
# SPDX-FileCopyrightText: © 2020-2024 Serpent OS Developers
#
# SPDX-License-Identifier: MPL-2.0
#
name : glew
version : 2.2.0
release : 1
homepage : https://github.com/nigels-com/glew
upstreams :
- https://downloads.sourceforge.net/glew/glew-2.2.0.tgz : d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
summary : The OpenGL Extension Wrangler Library
description : |
The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. GLEW provides efficient run-time mechanisms for determining which OpenGL extensions are supported on the target platform. OpenGL core and extension functionality is exposed in a single header file.
license :

Check warning on line 15 in g/glew/stone.yaml

View workflow job for this annotation

GitHub Actions / Checks 

invalid license identifier: 'BSD'

Check warning on line 15 in g/glew/stone.yaml

View workflow job for this annotation

GitHub Actions / Checks 

invalid license identifier: 'GPL'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Licenses need to be in SPDX identifier format. Please check against the following website: https://spdx.org/licenses/

- MIT
- BSD
- GPL
builddeps :
- binary(cc)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably don't need an explicit binary(cc) dependency

- pkgconfig(egl)
- pkgconfig(gl)
- pkgconfig(glu)
- pkgconfig(x11)
setup : |
%patch %(pkgdir)/glew-install.patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are these patches for? There's no comment in the header of the patches or before the patch lines indicating what exactly they are for. Are they even applicable to serpent or did you just copy them from elsewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simply check the history of Arch Linux, as mostly I adopt their changes.

%patch %(pkgdir)/egl+glx.patch

sed -i 's|lib64|lib|' config/Makefile.linux
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These seds should be a patch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine as sed.

sed -i '/^.PHONY: .*\.pc$/d' Makefile
build : |
%make STRIP= glew.bin
mv bin/glewinfo bin/glxewinfo
rm glew.pc

%make STRIP= SYSTEM=linux-egl glew.lib.shared bin/glewinfo
mv bin/glewinfo bin/eglewinfo
install : |
%make GLEW_DEST="%(installroot)/usr" STRIP= SYSTEM=linux-egl install
install -D -m755 -t "%(installroot)/usr/bin" bin/eglewinfo bin/glxewinfo bin/visualinfo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have an install_bin macro: https://github.com/serpent-os/tools/blob/8fa3d1fb5427c4376bcb8f78a31e5d908ca5d1ee/boulder/data/macros/actions/misc.yaml#L14

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would need 3 lines instead of one.

ln -s eglewinfo "%(installroot)/usr/bin/glewinfo"

install -D -m644 LICENSE.txt "%(installroot)/usr/share/licenses/glew/LICENSE"


Binary file added g/glfw/manifest.x86_64.bin
View file
Open in desktop
Binary file not shown.
Loading
Loading