gtkglextmm: romster -> contrib

This commit is contained in:
Danny Rawlins 2016-08-25 21:03:27 +10:00
parent bdc6516274
commit b8a5f1e356
7 changed files with 285 additions and 0 deletions

62
gtkglextmm/.footprint Normal file
View File

@ -0,0 +1,62 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkglmm.h
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/gdkmm/
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/gdkmm/gl/
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/config.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/context.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/defs.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/drawable.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/font.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/init.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/pixmap.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/pixmapext.h
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/config_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/context_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/drawable_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/pixmap_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/tokens_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/private/window_p.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/query.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/tokens.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/version.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/window.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/windowext.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gdkmm/gl/wrap_init.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkglmm.h
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/gtkmm/
drwxr-xr-x root/root usr/include/gtkglextmm-1.2/gtkmm/gl/
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkmm/gl/defs.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkmm/gl/drawingarea.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkmm/gl/init.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkmm/gl/version.h
-rw-r--r-- root/root usr/include/gtkglextmm-1.2/gtkmm/gl/widget.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/gtkglextmm-1.2/
drwxr-xr-x root/root usr/lib/gtkglextmm-1.2/include/
-rw-r--r-- root/root usr/lib/gtkglextmm-1.2/include/gdkglextmm-config.h
drwxr-xr-x root/root usr/lib/gtkglextmm-1.2/proc/
drwxr-xr-x root/root usr/lib/gtkglextmm-1.2/proc/m4/
-rw-r--r-- root/root usr/lib/gtkglextmm-1.2/proc/m4/convert.m4
-rw-r--r-- root/root usr/lib/gtkglextmm-1.2/proc/m4/convert_gdkglext.m4
-rw-r--r-- root/root usr/lib/gtkglextmm-1.2/proc/m4/convert_gtkglext.m4 (EMPTY)
-rw-r--r-- root/root usr/lib/libgdkglextmm-x11-1.2.a
-rwxr-xr-x root/root usr/lib/libgdkglextmm-x11-1.2.la
lrwxrwxrwx root/root usr/lib/libgdkglextmm-x11-1.2.so -> libgdkglextmm-x11-1.2.so.0.0.0
lrwxrwxrwx root/root usr/lib/libgdkglextmm-x11-1.2.so.0 -> libgdkglextmm-x11-1.2.so.0.0.0
-rwxr-xr-x root/root usr/lib/libgdkglextmm-x11-1.2.so.0.0.0
-rw-r--r-- root/root usr/lib/libgtkglextmm-x11-1.2.a
-rwxr-xr-x root/root usr/lib/libgtkglextmm-x11-1.2.la
lrwxrwxrwx root/root usr/lib/libgtkglextmm-x11-1.2.so -> libgtkglextmm-x11-1.2.so.0.0.0
lrwxrwxrwx root/root usr/lib/libgtkglextmm-x11-1.2.so.0 -> libgtkglextmm-x11-1.2.so.0.0.0
-rwxr-xr-x root/root usr/lib/libgtkglextmm-x11-1.2.so.0.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gdkglextmm-1.2.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdkglextmm-x11-1.2.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gtkglextmm-1.2.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gtkglextmm-x11-1.2.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/aclocal/
-rw-r--r-- root/root usr/share/aclocal/gtkglextmm-1.2.m4

5
gtkglextmm/.md5sum Normal file
View File

@ -0,0 +1,5 @@
60a2e7518a148ea3be59669770ee5aaa fix_ftbfs_gtk_2_20.patch
dd08d68c5e076dfa3293b00dd4150633 fix_ftbfs_gtk_2_36.patch
c39860d898a9ce24af3762fd351c5266 fix_ftbfs_gtk_2_37.patch
1f331ecdaa6ea3f9eaec8f0e54d6cd82 gtkglextmm-1.2.0-aclocal.patch
27c05f4d45c5fd07b6fb0f044add3056 gtkglextmm-1.2.0.tar.bz2

34
gtkglextmm/Pkgfile Normal file
View File

@ -0,0 +1,34 @@
# Description: GtkGLExtmm is a C++ wrapper for GtkGLExt.
# URL: http://www.k-3d.org/gtkglext/Main_Page
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Danny Rawlins, crux at romster dot me
# Depends on: gtkmm gtkglext mesa3d
name=gtkglextmm
version=1.2.0
release=4
source=(http://dl.sourceforge.net/sourceforge/gtkglext/gtkglextmm-$version.tar.bz2
gtkglextmm-1.2.0-aclocal.patch
fix_ftbfs_gtk_2_20.patch
fix_ftbfs_gtk_2_36.patch
fix_ftbfs_gtk_2_37.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/gtkglextmm-1.2.0-aclocal.patch
patch -p1 -i $SRC/fix_ftbfs_gtk_2_20.patch
patch -p1 -i $SRC/fix_ftbfs_gtk_2_36.patch
patch -p1 -i $SRC/fix_ftbfs_gtk_2_37.patch
CXXFLAGS+=' -std=c++11'
./configure \
--prefix=/usr \
--disable-gtkglext-test
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share/doc
}

View File

@ -0,0 +1,28 @@
Description: Fix FTBFS due to missing GdkSpanFunc definition
.
The sequence of #include directives is important - if gtk/gtkglwidget.h
is included first, before widget.h, it includes gdk.h without undefing
GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined
and compilation errors.
The fix is to first include widget.h which includes the right gdkmm header
which defines GDK_DISABLE_DEPRECATED before including gdk.h.
Forwarded: no
Bug-Ubuntu: http://launchpad.net/bugs/662572
Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:31:59.651270000 +0100
+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc 2010-12-08 13:32:10.871270000 +0100
@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gtk/gtkglwidget.h>
-
#include "widget.h"
+#include <gtk/gtkglwidget.h>
+
namespace Gtk
{
namespace GL

View File

@ -0,0 +1,121 @@
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc 2013-05-16 23:42:40.193801834 +0200
@@ -1,15 +1,8 @@
-
-#include <glib.h>
-
// Disable the 'const' function attribute of the get_type() functions.
// GCC would optimize them out because we don't use the return value.
#undef G_GNUC_CONST
#define G_GNUC_CONST /* empty */
-#include <gdkmm/gl/wrap_init.h>
-#include <glibmm/error.h>
-#include <glibmm/object.h>
-
// #include the widget headers so that we can call the get_type() static methods:
#include "tokens.h"
@@ -19,6 +12,12 @@
#include "pixmap.h"
#include "window.h"
+#include <glib.h>
+
+#include <gdkmm/gl/wrap_init.h>
+#include <glibmm/error.h>
+#include <glibmm/object.h>
+
extern "C"
{
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gdk/gdkglquery.h>
-
#include "query.h"
+#include <gdk/gdkglquery.h>
+
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,11 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include "pixmapext.h"
+
#include <gdk/gdkgldrawable.h>
#include <gdk/gdkglpixmap.h>
-#include "pixmapext.h"
-
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:40:48.363207736 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc 2013-05-16 23:42:40.193801834 +0200
@@ -17,11 +17,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include "windowext.h"
+
#include <gdk/gdkgldrawable.h>
#include <gdk/gdkglwindow.h>
-#include "windowext.h"
-
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc 2004-05-18 08:01:49.000000000 +0200
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc 2013-05-16 23:43:07.637456821 +0200
@@ -17,10 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <gdk/gdkglfont.h>
-
#include "font.h"
+#include <gdk/gdkglfont.h>
+
namespace Gdk
{
namespace GL
Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
===================================================================
--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc 2003-02-27 10:49:24.000000000 +0100
+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc 2013-05-16 23:44:38.320316782 +0200
@@ -19,11 +19,11 @@
#include <cstdlib>
-#include <gdk/gdkglinit.h>
-
#include "wrap_init.h"
#include "init.h"
+#include <gdk/gdkglinit.h>
+
namespace Gdk
{
namespace GL

View File

@ -0,0 +1,24 @@
diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc
index 82bb7f4..5a8c5e3 100644
--- a/gtkglext/gtkmm/gl/drawingarea.cc
+++ b/gtkglext/gtkmm/gl/drawingarea.cc
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include <glibmm.h>
#include "drawingarea.h"
namespace Gtk
diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc
index 598d6e2..2d6833b 100644
--- a/gtkglext/gtkmm/gl/widget.cc
+++ b/gtkglext/gtkmm/gl/widget.cc
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+#include <glibmm.h>
#include "widget.h"
#include <gtk/gtkglwidget.h>

View File

@ -0,0 +1,11 @@
--- a/m4macros/gtkglextmm.m4 2004-05-18 08:29:34.000000000 +0200
+++ b/m4macros/gtkglextmm.m4 2006-05-31 16:46:09.000000000 +0200
@@ -222,7 +222,7 @@
dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [, ACTION-IF-NOT-SUPPORTED]])
dnl Checks whether gtkglextmm supports multihead.
dnl
-AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD,
+AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD],
[ AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CACHE_CHECK([whether gtkglextmm supports multihead],