first commit

4 files changed, 157 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..f8a9799ad8bf
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = glxosd-fix-git
+	pkgdesc = (no nvidia proprietary dep, fix compile errors) An OSD for OpenGL applications running under the X Window System. This allows you to monitor your framerate and hardware temperature in games on Linux!
+	pkgver = r209.dbb44b7
+	pkgrel = 1
+	url = https://github.com/nickguletskii/GLXOSD
+	arch = i686
+	arch = x86_64
+	license = GPL
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = git
+	makedepends = boost
+	depends = mesa
+	depends = glu
+	depends = fontconfig
+	depends = freetype2
+	depends = lm_sensors
+	depends = libxext
+	provides = glxosd
+	conflicts = glxosd
+	source = git://github.com/nickguletskii/GLXOSD.git
+	md5sums = SKIP
+
+pkgname = glxosd-fix-git
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..07bdbf30c50a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.tar.xz
+/pkg
+/src
+/GLXOSD
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..36d7ac20f68a
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer:  Franc[e]sco <lolisamurai@tfwno.gf>
+pkgname=glxosd-fix-git
+provides=('glxosd-git')
+_gitname=GLXOSD
+pkgver=r209.dbb44b7
+pkgrel=1
+pkgdesc="(no nvidia proprietary dep, fix compile errors) An OSD for OpenGL applications running under the X Window System. This allows you to monitor your framerate and hardware temperature in games on Linux!"
+arch=('i686' 'x86_64')
+url="https://github.com/nickguletskii/GLXOSD"
+license=('GPL')
+depends=('mesa' 'glu' 'fontconfig' 'freetype2' 'lm_sensors' 'libxext')
+makedepends=('cmake' 'gcc' 'git' 'boost')
+provides=('glxosd')
+conflicts=('glxosd')
+source=('git://github.com/nickguletskii/GLXOSD.git')
+md5sums=('SKIP')
+
+pkgver() {
+	cd "${srcdir}/$_gitname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+	cd "$srcdir/$_gitname"
+	git submodule init
+	git submodule update --recursive
+	patch --forward --strip=1 --input="${startdir}/glxosd-fix.patch"
+}
+
+build() {
+	cd "$srcdir/GLXOSD"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" 
+	make all
+}
+
+package() {
+	cd "$srcdir/$_gitname"
+	make DESTDIR="$pkgdir/" install
+	
+	if [ -d "$pkgdir/usr/lib64" ]; then
+		mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
+	fi
+	
+	sed -i 's+/usr//lib/x86_64-linux-gnu//glxosd/+/usr/lib/glxosd+g' \
+		"$pkgdir/usr/bin/glxosd"
+	sed -i 's+/usr//lib/i386-linux-gnu//glxosd+/usr/lib/glxosd+g' \
+		"$pkgdir/usr/bin/glxosd"
+}
diff --git a/glxosd-fix.patch b/glxosd-fix.patch
new file mode 100644
index 000000000000..eaecf04aca87
--- /dev/null
+++ b/glxosd-fix.patch
@@ -0,0 +1,79 @@
+diff --git a/src/glinject/glinject.c b/src/glinject/glinject.c
+index 6917439..2c8200a 100644
+--- a/src/glinject/glinject.c
++++ b/src/glinject/glinject.c
+@@ -23,6 +23,13 @@
+ #include <stdbool.h>
+ #include <pthread.h>
+ 
++GLINJECT_DEFINE_REAL_SYMBOL(dlopen, void*, (const char *, int));
++
++GLINJECT_DEFINE_REAL_SYMBOL(dlsym, void*, (const void *, const char *));
++
++GLINJECT_DEFINE_REAL_SYMBOL(dlvsym, void*,
++		(const void *, const char *, const char *));
++
+ // Mutex used for synchronising Lua API calls.
+ pthread_mutex_t glinject_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+diff --git a/src/glinject/glinject.h b/src/glinject/glinject.h
+index 7f35f95..7603764 100644
+--- a/src/glinject/glinject.h
++++ b/src/glinject/glinject.h
+@@ -21,6 +21,10 @@
+ 		typedef ret (*glinject_##name##_type) param;\
+ 		glinject_##name##_type glinject_real_##name;
+ 
++#define GLINJECT_DEFINE_REAL_SYMBOL_EXT(name, ret, param)\
++		typedef ret (*glinject_##name##_type) param;\
++		extern glinject_##name##_type glinject_real_##name;
++
+ #define GLINJECT_DEFINE_AND_OVERLOAD(name, ret, param)\
+ 		GLINJECT_DEFINE_REAL_SYMBOL(name, ret, param);\
+ 		ret name param
+@@ -41,11 +45,11 @@ typedef __GLXextFuncPtr (*gl_function_provider_type)(const GLubyte* name);
+ /*
+  * Real symbol definitions
+  */
+-GLINJECT_DEFINE_REAL_SYMBOL(dlopen, void*, (const char *, int));
++GLINJECT_DEFINE_REAL_SYMBOL_EXT(dlopen, void*, (const char *, int));
+ 
+-GLINJECT_DEFINE_REAL_SYMBOL(dlsym, void*, (const void *, const char *));
++GLINJECT_DEFINE_REAL_SYMBOL_EXT(dlsym, void*, (const void *, const char *));
+ 
+-GLINJECT_DEFINE_REAL_SYMBOL(dlvsym, void*,
++GLINJECT_DEFINE_REAL_SYMBOL_EXT(dlvsym, void*,
+ 		(const void *, const char *, const char *));
+ 
+ /*
+diff --git a/src/glinject/glx_events.c b/src/glinject/glx_events.c
+index 4012d4b..8bc3857 100644
+--- a/src/glinject/glx_events.c
++++ b/src/glinject/glx_events.c
+@@ -21,6 +21,10 @@ void glXDestroy##name (Display *dpy, type drawable) { \
+ 	glinject_real_glXDestroy##name(dpy, drawable); \
+ }
+ 
++
++GLINJECT_DEFINE_REAL_SYMBOL(glXGetProcAddressARB, __GLXextFuncPtr, (const GLubyte*));
++GLINJECT_DEFINE_REAL_SYMBOL(glXGetProcAddress, __GLXextFuncPtr, (const GLubyte*));
++
+ DEFINE_GLX_DESTRUCTION_HANDLER(GLXPixmap, GLXPixmap)
+ DEFINE_GLX_DESTRUCTION_HANDLER(Pixmap, GLXPixmap)
+ DEFINE_GLX_DESTRUCTION_HANDLER(Pbuffer, GLXPbuffer)
+diff --git a/src/glinject/glx_events.h b/src/glinject/glx_events.h
+index 377cf8c..e5688c9 100644
+--- a/src/glinject/glx_events.h
++++ b/src/glinject/glx_events.h
+@@ -12,9 +12,9 @@
+ #include "glinject.h"
+ typedef __GLXextFuncPtr (*gl_function_provider_type)(const GLubyte* name);
+ 
+-GLINJECT_DEFINE_REAL_SYMBOL(glXGetProcAddressARB, __GLXextFuncPtr, (const GLubyte*));
++GLINJECT_DEFINE_REAL_SYMBOL_EXT(glXGetProcAddressARB, __GLXextFuncPtr, (const GLubyte*));
+ 
+-GLINJECT_DEFINE_REAL_SYMBOL(glXGetProcAddress, __GLXextFuncPtr, (const GLubyte*));
++GLINJECT_DEFINE_REAL_SYMBOL_EXT(glXGetProcAddress, __GLXextFuncPtr, (const GLubyte*));
+ 
+ void glinject_load_glx_event_real_symbols(const char* path);
+