summaryrefslogtreecommitdiff
path: root/package/fltk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-09-14 18:48:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-09-14 18:48:17 +0200
commitd9bb269a252853fd6a59aa6aaa190c5d8614acc8 (patch)
tree388c1442d61d535a7e2a7587e306fdac07597e51 /package/fltk
parent476d4ff7d822e2e822dd6da36178c327fff59eba (diff)
parent5eff21ca1834a2d820c445d72076156a84950f12 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/fltk')
-rw-r--r--package/fltk/Makefile13
-rw-r--r--package/fltk/patches/patch-Makefile12
-rw-r--r--package/fltk/patches/patch-OpenGL_Makefile11
-rw-r--r--package/fltk/patches/patch-configure20
-rw-r--r--package/fltk/patches/patch-fltk2-config_in27
-rw-r--r--package/fltk/patches/patch-images_Makefile11
-rw-r--r--package/fltk/patches/patch-makeinclude_in20
7 files changed, 12 insertions, 102 deletions
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 59c6cdcff..d727bb7f6 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -4,22 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= fltk
-PKG_VERSION:= 2.0
-PKG_RELEASE:= 3
-PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a
+PKG_VERSION:= 1.3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 92f6e29921227eec3426a07425c71232
PKG_DESCR:= fast light toolkit
PKG_SECTION:= libs
PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype
PKG_URL:= http://www.fltk.org/
-PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+PKG_SITES:= http://openadk.org/distfiles/
PKG_NEED_CXX:= 1
PKG_CXX:= LIBFLTK
PKG_SUBPKGS:= LIBFLTK
-PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
-WRKDIST= ${WRKDIR}/${PKG_NAME}-2.0.x-r7513
+DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
include $(TOPDIR)/mk/package.mk
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
index 466aef887..568110189 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- fltk-2.0.x-r7513.orig/Makefile 2010-04-15 18:29:49.000000000 +0200
-+++ fltk-2.0.x-r7513/Makefile 2011-01-14 22:01:49.000000000 +0100
-@@ -25,7 +25,7 @@
+--- fltk-1.3.0.orig/Makefile 2011-02-15 16:29:03.000000000 +0100
++++ fltk-1.3.0/Makefile 2011-09-12 20:20:27.137980830 +0200
+@@ -27,7 +27,7 @@
include makeinclude
--DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
-+DIRS = src $(LOCALIMAGES) images OpenGL fluid
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
- all: makeinclude
+ all: makeinclude fltk-config
for dir in $(DIRS); do\
diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile
deleted file mode 100644
index 71ac77285..000000000
--- a/package/fltk/patches/patch-OpenGL_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/OpenGL/Makefile 2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/OpenGL/Makefile 2011-03-25 13:56:09.304620874 +0100
-@@ -102,7 +102,7 @@ include makedepend
-
- ../lib/$(DSONAME): $(OBJECTS)
- echo $(DSOCOMMAND) $@ ...
-- $(DSOCOMMAND) $@ $(OBJECTS)
-+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- $(RM) ../lib/$(DSOLINK)
- $(LN) $(DSONAME) ../lib/$(DSOLINK)
-
diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure
deleted file mode 100644
index 613c7b595..000000000
--- a/package/fltk/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/configure 2010-04-16 10:02:53.000000000 +0200
-+++ fltk-2.0.x-r7513/configure 2011-03-25 13:52:41.555870814 +0100
-@@ -1770,7 +1770,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
-
-
-
--uname=`uname`
-+uname=Linux
- uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
- case $uname in
- IRIX*)
-@@ -1922,7 +1922,7 @@ if test x$enable_shared = xyes; then
- ;;
- Linux* | *BSD*)
- # DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-- DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+ DSOCOMMAND="\$(CXX) -shared -fPIC $DEBUGFLAG -o"
- if test "$libdir" != "/usr/lib"; then
- DSOLINK="-Wl,-rpath,$libdir"
- fi
diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in
deleted file mode 100644
index c4784688a..000000000
--- a/package/fltk/patches/patch-fltk2-config_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- fltk-2.0.x-r7513.orig/fltk2-config.in 2006-04-15 19:43:12.000000000 +0200
-+++ fltk-2.0.x-r7513/fltk2-config.in 2011-01-08 23:34:40.000000000 +0100
-@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@"
- # libraries to link with:
- LIBNAME="@LIBNAME@"
- DSONAME="@DSONAME@"
--DSOLINK="@DSOLINK@"
- IMAGELIBS="@IMAGELIBS@"
- SHAREDSUFFIX="@SHAREDSUFFIX@"
-
-@@ -168,7 +167,6 @@ do
- bindir=${exec_prefix}
- includedir=${prefix}/include
- libdir=${prefix}/lib
-- DSOLINK="-Wl,-rpath,${prefix}/lib"
- ;;
- --prefix)
- echo_prefix=yes
-@@ -283,7 +281,7 @@ if test x$use_images = xyes; then
- LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS"
- fi
-
--LDLIBS="$DSOLINK $LDLIBS"
-+LDLIBS="$LDLIBS"
- LDSTATIC="$LDSTATIC_PATHS $LDSTATIC"
-
- # Answer to user requests
diff --git a/package/fltk/patches/patch-images_Makefile b/package/fltk/patches/patch-images_Makefile
deleted file mode 100644
index ddd993d18..000000000
--- a/package/fltk/patches/patch-images_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/images/Makefile 2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/images/Makefile 2011-03-25 13:53:36.614620804 +0100
-@@ -109,7 +109,7 @@ include makedepend
-
- ../lib/$(DSONAME): $(OBJECTS)
- echo $(DSOCOMMAND) $@ ...
-- $(DSOCOMMAND) $@ $(OBJECTS)
-+ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- $(RM) ../lib/$(DSOLINK)
- $(LN) $(DSONAME) ../lib/$(DSOLINK)
-
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
deleted file mode 100644
index 46a7d397f..000000000
--- a/package/fltk/patches/patch-makeinclude_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/makeinclude.in 2006-04-11 00:06:06.000000000 +0200
-+++ fltk-2.0.x-r7513/makeinclude.in 2011-03-25 12:03:06.633370885 +0100
-@@ -45,7 +45,7 @@ NROFF = @NROFF@
- RM = rm -f
- RMDIR = rm -rf
- SHELL = /bin/sh
--STRIP = strip
-+STRIP = echo
-
- # compiler names:
- CC = @CC@
-@@ -115,7 +115,7 @@ CAT1EXT = @CAT1EXT@
- CAT3EXT = @CAT3EXT@
-
- # Be quiet when building...
--.SILENT:
-+#.SILENT:
-
- # Build commands and filename extensions...
- .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)