Merge pull request #367 from grauehaare/master
Updated: shlibs, gtkglext (removed deprecated things)
This commit is contained in:
commit
356d961081
13 changed files with 273 additions and 3 deletions
|
@ -1576,8 +1576,8 @@ libosmovty.so.0 libosmocore-0.6.6_1
|
||||||
libosmocodec.so.0 libosmocore-0.6.6_1
|
libosmocodec.so.0 libosmocore-0.6.6_1
|
||||||
libosmogsm.so.5 libosmocore-0.6.6_1
|
libosmogsm.so.5 libosmocore-0.6.6_1
|
||||||
libosmogb.so.3 libosmocore-0.6.6_1
|
libosmogb.so.3 libosmocore-0.6.6_1
|
||||||
libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_1
|
libgtkglext-x11-1.0.so.0 gtkglext-1.2.0_4
|
||||||
libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_1
|
libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
|
||||||
libXaw3d.so.8 libXaw3d-1.6.2_1
|
libXaw3d.so.8 libXaw3d-1.6.2_1
|
||||||
libshiboken-python2.7.so.1.2 python-shiboken-1.2.2_1
|
libshiboken-python2.7.so.1.2 python-shiboken-1.2.2_1
|
||||||
libpyside-python2.7.so.1.2 python-pyside-1.2.2_1
|
libpyside-python2.7.so.1.2 python-pyside-1.2.2_1
|
||||||
|
|
10
srcpkgs/celestia-glut/patches/NULL_notdecleared.patch
Normal file
10
srcpkgs/celestia-glut/patches/NULL_notdecleared.patch
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
--- src/celengine/frametree.h.orig 2014-04-26 16:08:47.217900392 +0200
|
||||||
|
+++ src/celengine/frametree.h 2014-04-26 16:09:09.601899991 +0200
|
||||||
|
@@ -13,6 +13,7 @@
|
||||||
|
#ifndef _CELENGINE_FRAMETREE_H_
|
||||||
|
#define _CELENGINE_FRAMETREE_H_
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
class Star;
|
12
srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch
Normal file
12
srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
--- src/celestia/imagecapture.cpp.orig 2014-04-26 16:15:37.185893050 +0200
|
||||||
|
+++ src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200
|
||||||
|
@@ -31,6 +31,9 @@
|
||||||
|
#include "png.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+// Z_BEST_COMPRESSION
|
||||||
|
+#include <zlib.h>
|
||||||
|
+
|
||||||
|
// Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
|
||||||
|
#ifndef png_jmpbuf
|
||||||
|
#define png_jmpbuf(png_ptr) png_ptr->jmpbuf
|
21
srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch
Normal file
21
srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
--- src/celengine/image.cpp.orig 2014-04-26 14:41:56.359993709 +0200
|
||||||
|
+++ src/celengine/image.cpp 2014-04-26 14:42:16.886993341 +0200
|
||||||
|
@@ -42,6 +42,7 @@
|
||||||
|
#include "jpeglib.h"
|
||||||
|
#else
|
||||||
|
#include <cstdio>
|
||||||
|
+#include <string.h>
|
||||||
|
#include <jpeglib.h>
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
--- src/celengine/texture.cpp.orig 2014-04-26 15:54:19.937915924 +0200
|
||||||
|
+++ src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cassert>
|
||||||
|
+#include <string.h>
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#ifndef TARGET_OS_MAC
|
11
srcpkgs/celestia-glut/patches/missing_mathlib.patch
Normal file
11
srcpkgs/celestia-glut/patches/missing_mathlib.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- src/celmath/intersect.h.orig 2014-04-26 15:57:58.793912004 +0200
|
||||||
|
+++ src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
#include "ray.h"
|
||||||
|
#include "sphere.h"
|
||||||
|
#include "ellipsoid.h"
|
||||||
|
-
|
||||||
|
+#include "mathlib.h"
|
||||||
|
|
||||||
|
template<class T> bool testIntersection(const Ray3<T>& ray,
|
||||||
|
const Sphere<T>& sphere,
|
19
srcpkgs/celestia-glut/template
Normal file
19
srcpkgs/celestia-glut/template
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
# Template file for 'celestia-glut'
|
||||||
|
pkgname=celestia-glut
|
||||||
|
version=1.6.1
|
||||||
|
revision=1
|
||||||
|
short_desc="free space simulation using GLUT"
|
||||||
|
maintainer="Martin Riese <grauehaare@gmx.de>"
|
||||||
|
license="GPL-2"
|
||||||
|
homepage="http://www.shatters.net/celestia/"
|
||||||
|
distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
|
||||||
|
checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
|
||||||
|
build_style=gnu-configure
|
||||||
|
configure_args="--with-glut --with-lua --enable-theora --disable-static"
|
||||||
|
hostmakedepends="pkg-config"
|
||||||
|
makedepends="gtkglext-devel zlib-devel lua51-devel glu-devel libfreeglut-devel libjpeg-turbo-devel libpng-devel libtheora-devel pangox-compat-devel"
|
||||||
|
wrksrc=celestia-${version}
|
||||||
|
|
||||||
|
do_build() {
|
||||||
|
make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="-lpng -ljpeg -llua5.1 -lglut -lGLU -lGL -logg -ltheora -lz -ldl -pthread"
|
||||||
|
}
|
10
srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch
Normal file
10
srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
--- src/celengine/frametree.h.orig 2014-04-26 16:08:47.217900392 +0200
|
||||||
|
+++ src/celengine/frametree.h 2014-04-26 16:09:09.601899991 +0200
|
||||||
|
@@ -13,6 +13,7 @@
|
||||||
|
#ifndef _CELENGINE_FRAMETREE_H_
|
||||||
|
#define _CELENGINE_FRAMETREE_H_
|
||||||
|
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
class Star;
|
12
srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch
Normal file
12
srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
--- src/celestia/imagecapture.cpp.orig 2014-04-26 16:15:37.185893050 +0200
|
||||||
|
+++ src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200
|
||||||
|
@@ -31,6 +31,9 @@
|
||||||
|
#include "png.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+// Z_BEST_COMPRESSION
|
||||||
|
+#include <zlib.h>
|
||||||
|
+
|
||||||
|
// Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
|
||||||
|
#ifndef png_jmpbuf
|
||||||
|
#define png_jmpbuf(png_ptr) png_ptr->jmpbuf
|
21
srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch
Normal file
21
srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
--- src/celengine/image.cpp.orig 2014-04-26 14:41:56.359993709 +0200
|
||||||
|
+++ src/celengine/image.cpp 2014-04-26 14:42:16.886993341 +0200
|
||||||
|
@@ -42,6 +42,7 @@
|
||||||
|
#include "jpeglib.h"
|
||||||
|
#else
|
||||||
|
#include <cstdio>
|
||||||
|
+#include <string.h>
|
||||||
|
#include <jpeglib.h>
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
--- src/celengine/texture.cpp.orig 2014-04-26 15:54:19.937915924 +0200
|
||||||
|
+++ src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cassert>
|
||||||
|
+#include <string.h>
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
#ifndef TARGET_OS_MAC
|
11
srcpkgs/celestia-gtk/patches/missing_mathlib.patch
Normal file
11
srcpkgs/celestia-gtk/patches/missing_mathlib.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- src/celmath/intersect.h.orig 2014-04-26 15:57:58.793912004 +0200
|
||||||
|
+++ src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
#include "ray.h"
|
||||||
|
#include "sphere.h"
|
||||||
|
#include "ellipsoid.h"
|
||||||
|
-
|
||||||
|
+#include "mathlib.h"
|
||||||
|
|
||||||
|
template<class T> bool testIntersection(const Ray3<T>& ray,
|
||||||
|
const Sphere<T>& sphere,
|
20
srcpkgs/celestia-gtk/template
Normal file
20
srcpkgs/celestia-gtk/template
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Template file for 'celestia-gtk'
|
||||||
|
pkgname=celestia-gtk
|
||||||
|
version=1.6.1
|
||||||
|
revision=1
|
||||||
|
short_desc="free space simulation using GTK"
|
||||||
|
maintainer="Martin Riese <grauehaare@gmx.de>"
|
||||||
|
license="GPL-2"
|
||||||
|
homepage="http://www.shatters.net/celestia/"
|
||||||
|
distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
|
||||||
|
checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
|
||||||
|
build_style=gnu-configure
|
||||||
|
configure_args="--with-gtk --with-lua --enable-theora --disable-static"
|
||||||
|
hostmakedepends="pkg-config"
|
||||||
|
makedepends="gtkglext-devel zlib-devel lua51-devel glu-devel gtk+-devel libjpeg-turbo-devel
|
||||||
|
libpng-devel libtheora-devel pangox-compat-devel"
|
||||||
|
wrksrc=celestia-${version}
|
||||||
|
|
||||||
|
do_build() {
|
||||||
|
make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="-lpng -ljpeg -llua5.1 -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -logg -ltheora -lz -ldl -pthread"
|
||||||
|
}
|
123
srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch
Normal file
123
srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch
Normal file
|
@ -0,0 +1,123 @@
|
||||||
|
--- examples/Makefile.am.orig 2003-09-09 11:50:04.000000000 +0200
|
||||||
|
+++ examples/Makefile.am 2014-04-30 20:40:58.471481327 +0200
|
||||||
|
@@ -17,11 +17,7 @@ INCLUDES = \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
-I$(top_builddir)/gtk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(EXAMPLES_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED
|
||||||
|
+ $(EXAMPLES_DEP_CFLAGS)
|
||||||
|
|
||||||
|
DEPS = \
|
||||||
|
$(top_builddir)/gdk/$(gdkglext_targetlib) \
|
||||||
|
|
||||||
|
--- examples/Makefile.in.orig 2006-02-05 04:17:39.000000000 +0100
|
||||||
|
+++ examples/Makefile.in 2014-04-30 20:41:15.559479928 +0200
|
||||||
|
@@ -233,11 +233,7 @@ INCLUDES = \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
-I$(top_builddir)/gtk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(EXAMPLES_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED
|
||||||
|
+ $(EXAMPLES_DEP_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
DEPS = \
|
||||||
|
|
||||||
|
--- gdk/Makefile.am.orig 2003-08-15 11:10:38.000000000 +0200
|
||||||
|
+++ gdk/Makefile.am 2014-04-30 20:41:45.415477484 +0200
|
||||||
|
@@ -43,10 +43,7 @@ common_includes = \
|
||||||
|
-DGDK_GL_COMPILATION \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(GDKGLEXT_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED
|
||||||
|
+ $(GDKGLEXT_DEP_CFLAGS)
|
||||||
|
|
||||||
|
common_ldflags = \
|
||||||
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||||
|
|
||||||
|
--- gdk/Makefile.in.orig 2006-02-05 04:17:40.000000000 +0100
|
||||||
|
+++ gdk/Makefile.in 2014-04-30 20:41:55.816476633 +0200
|
||||||
|
@@ -238,10 +238,7 @@ common_includes = \
|
||||||
|
-DGDK_GL_COMPILATION \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(GDKGLEXT_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED
|
||||||
|
+ $(GDKGLEXT_DEP_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
common_ldflags = \
|
||||||
|
|
||||||
|
--- gdk/x11/Makefile.am.orig 2003-05-07 20:18:42.000000000 +0200
|
||||||
|
+++ gdk/x11/Makefile.am 2014-04-30 20:42:26.856474092 +0200
|
||||||
|
@@ -10,10 +10,7 @@ INCLUDES = \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
$(GDKGLEXT_DEP_CFLAGS) \
|
||||||
|
- $(GDKGLEXT_WIN_EXTRA_DEFS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED
|
||||||
|
+ $(GDKGLEXT_WIN_EXTRA_DEFS)
|
||||||
|
|
||||||
|
LDADDS = \
|
||||||
|
$(GDKGLEXT_DEP_LIBS)
|
||||||
|
|
||||||
|
--- gdk/x11/Makefile.in.orig 2006-02-05 04:17:42.000000000 +0100
|
||||||
|
+++ gdk/x11/Makefile.in 2014-04-30 20:42:37.128473251 +0200
|
||||||
|
@@ -225,10 +225,7 @@ INCLUDES = \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
$(GDKGLEXT_DEP_CFLAGS) \
|
||||||
|
- $(GDKGLEXT_WIN_EXTRA_DEFS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED
|
||||||
|
+ $(GDKGLEXT_WIN_EXTRA_DEFS)
|
||||||
|
|
||||||
|
|
||||||
|
LDADDS = \
|
||||||
|
|
||||||
|
--- gtk/Makefile.am.orig 2003-05-09 15:55:05.000000000 +0200
|
||||||
|
+++ gtk/Makefile.am 2014-04-30 20:43:04.456471014 +0200
|
||||||
|
@@ -36,11 +36,7 @@ common_includes = \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(GTKGLEXT_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED
|
||||||
|
+ $(GTKGLEXT_DEP_CFLAGS)
|
||||||
|
|
||||||
|
common_ldflags = \
|
||||||
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
||||||
|
|
||||||
|
--- gtk/Makefile.in.orig 2006-02-05 04:17:42.000000000 +0100
|
||||||
|
+++ gtk/Makefile.in 2014-04-30 20:43:16.224470051 +0200
|
||||||
|
@@ -234,11 +234,7 @@ common_includes = \
|
||||||
|
-I$(top_srcdir) \
|
||||||
|
-I$(top_builddir)/gdk \
|
||||||
|
$(GTKGLEXT_DEBUG_FLAGS) \
|
||||||
|
- $(GTKGLEXT_DEP_CFLAGS) \
|
||||||
|
- -DG_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_DISABLE_DEPRECATED \
|
||||||
|
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||||
|
- -DGTK_DISABLE_DEPRECATED
|
||||||
|
+ $(GTKGLEXT_DEP_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
common_ldflags = \
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'gtkglext'
|
# Template file for 'gtkglext'
|
||||||
pkgname=gtkglext
|
pkgname=gtkglext
|
||||||
version=1.2.0
|
version=1.2.0
|
||||||
revision=3
|
revision=4
|
||||||
short_desc="OpenGL extension to GTK+"
|
short_desc="OpenGL extension to GTK+"
|
||||||
maintainer="Martin Riese <grauehaare@gmx.de>"
|
maintainer="Martin Riese <grauehaare@gmx.de>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
|
|
Loading…
Reference in a new issue