[Buildroot] svn commit: trunk/buildroot/package/fltk

[Buildroot] svn commit: trunk/buildroot/package/fltk

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-03-20 09:54:51 -0700 (Thu, 20 Mar 2008)
New Revision: 21415

Log:
some fixes for fltk

Added:
   trunk/buildroot/package/fltk/fltk-1.1.7-makefiles.patch

Modified:
   trunk/buildroot/package/fltk/fltk.mk


Changeset:
Added: trunk/buildroot/package/fltk/fltk-1.1.7-makefiles.patch
===================================================================
--- trunk/buildroot/package/fltk/fltk-1.1.7-makefiles.patch	                        (rev 0)
+++ trunk/buildroot/package/fltk/fltk-1.1.7-makefiles.patch	2008-03-20 16:54:51 UTC (rev 21415)
@@ -0,0 +1,132 @@
+--- a/jpeg/Makefile	2005-02-27 19:11:07.000000000 -0500
++++ b/jpeg/Makefile	2008-03-19 13:17:46.000000000 -0400
+@@ -65,14 +65,14 @@ clean:
+ #
+ 
+ install:
+-	echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..."
+-	-$(MKDIR) $(libdir)
+-	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
+-	$(CP) $(LIBJPEG) $(libdir)
+-	$(RANLIB) $(libdir)/libfltk_jpeg$(LIBEXT)
+-	echo "Installing jpeg headers in $(includedir)/FL/images..."
+-	-$(MKDIR) $(includedir)/FL/images
+-	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(includedir)/FL/images
++	echo "Installing libfltk_jpeg$(LIBEXT) in $(DESTDIR)$(libdir)..."
++	-$(MKDIR) $(DESTDIR)$(libdir)
++	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
++	$(CP) $(LIBJPEG) $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
++	echo "Installing jpeg headers in $(DESTDIR)$(includedir)/FL/images..."
++	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
++	$(CP) jconfig.h jerror.h jmorecfg.h jpeglib.h $(DESTDIR)$(includedir)/FL/images
+ 
+ 
+ #
+@@ -81,12 +81,12 @@ install:
+ 
+ uninstall:
+ 	echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."
+-	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
++	$(RM) $(DESTDIR)$(libdir)/libfltk_jpeg$(LIBEXT)
+ 	echo "Uninstalling jpeg headers in $(includedir)/FL/images..."
+-	$(RM) $(includedir)/FL/images/jconfig.h
+-	$(RM) $(includedir)/FL/images/jerror.h
+-	$(RM) $(includedir)/FL/images/jmorecfg.h
+-	$(RM) $(includedir)/FL/images/jpeglib.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/jconfig.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/jerror.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/jmorecfg.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/jpeglib.h
+ 
+ 
+ #
+
+--- a/png/Makefile	2005-02-24 16:55:12.000000000 -0500
++++ b/png/Makefile	2008-03-19 13:18:38.000000000 -0400
+@@ -57,14 +57,14 @@ clean:
+ #
+ 
+ install: $(LIBPNG)
+-	echo "Installing libfltk_png$(LIBEXT) in $(libdir)..."
+-	-$(MKDIR) $(libdir)
+-	$(RM) $(libdir)/libfltk_png$(LIBEXT)
+-	$(CP) $(LIBPNG) $(libdir)
+-	$(RANLIB) $(libdir)/libfltk_png$(LIBEXT)
+-	echo "Installing png headers in $(includedir)/FL/images..."
+-	-$(MKDIR) $(includedir)/FL/images
+-	$(CP) png.h pngconf.h $(includedir)/FL/images
++	echo "Installing libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."
++	-$(MKDIR) $(DESTDIR)$(libdir)
++	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
++	$(CP) $(LIBPNG) $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
++	echo "Installing png headers in $(DESTDIR)$(includedir)/FL/images..."
++	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
++	$(CP) png.h pngconf.h $(DESTDIR)$(includedir)/FL/images
+ 
+ 
+ #
+@@ -72,11 +72,11 @@ install: $(LIBPNG)
+ #
+ 
+ uninstall:
+-	echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..."
+-	$(RM) $(libdir)/libfltk_png$(LIBEXT)
+-	echo "Uninstalling png headers in $(includedir)/FL/images..."
+-	$(RM) $(includedir)/FL/images/png.h
+-	$(RM) $(includedir)/FL/images/pngconf.h
++	echo "Uninstalling libfltk_png$(LIBEXT) in $(DESTDIR)$(libdir)..."
++	$(RM) $(DESTDIR)$(libdir)/libfltk_png$(LIBEXT)
++	echo "Uninstalling png headers in $(DESTDIR)$(includedir)/FL/images..."
++	$(RM) $(DESTDIR)$(includedir)/FL/images/png.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/pngconf.h
+ 
+ 
+ #
+
+--- a/zlib/Makefile	2005-02-24 16:55:12.000000000 -0500
++++ b/zlib/Makefile	2008-03-19 13:20:34.000000000 -0400
+@@ -57,14 +57,14 @@ clean:
+ #
+ 
+ install: $(LIBZ)
+-	echo "Installing libfltk_z$(LIBEXT) in $(libdir)..."
+-	-$(MKDIR) $(libdir)
+-	$(RM) $(libdir)/libfltk_z$(LIBEXT)
+-	$(CP) $(LIBZ) $(libdir)
+-	$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)
+-	echo "Installing zlib headers in $(includedir)/FL/images..."
+-	-$(MKDIR) $(includedir)/FL/images
+-	$(CP) zconf.h zlib.h zutil.h $(includedir)/FL/images
++	echo "Installing libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."
++	-$(MKDIR) $(DESTDIR)$(libdir)
++	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
++	$(CP) $(LIBZ) $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
++	echo "Installing zlib headers in $(DESTDIR)$(includedir)/FL/images..."
++	-$(MKDIR) $(DESTDIR)$(includedir)/FL/images
++	$(CP) zconf.h zlib.h zutil.h $(DESTDIR)$(includedir)/FL/images
+ 
+ 
+ #
+@@ -72,12 +72,12 @@ install: $(LIBZ)
+ #
+ 
+ uninstall:
+-	echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."
+-	$(RM) $(libdir)/libfltk_z$(LIBEXT)
+-	echo "Uninstalling zlib headers in $(includedir)/FL/images..."
+-	$(RM) $(includedir)/FL/images/zconf.h
+-	$(RM) $(includedir)/FL/images/zlib.h
+-	$(RM) $(includedir)/FL/images/zutil.h
++	echo "Uninstalling libfltk_z$(LIBEXT) in $(DESTDIR)$(libdir)..."
++	$(RM) $(DESTDIR)$(libdir)/libfltk_z$(LIBEXT)
++	echo "Uninstalling zlib headers in $(DESTDIR)$(includedir)/FL/images..."
++	$(RM) $(DESTDIR)$(includedir)/FL/images/zconf.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/zlib.h
++	$(RM) $(DESTDIR)$(includedir)/FL/images/zutil.h
+ 
+ 
+ #
+

Modified: trunk/buildroot/package/fltk/fltk.mk
===================================================================
--- trunk/buildroot/package/fltk/fltk.mk	2008-03-20 16:05:02 UTC (rev 21414)
+++ trunk/buildroot/package/fltk/fltk.mk	2008-03-20 16:54:51 UTC (rev 21415)
@@ -10,11 +10,13 @@
 FLTK_AUTORECONF = NO
 FLTK_INSTALL_STAGING = YES
 FLTK_INSTALL_TARGET = YES
-FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
+FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
+FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
+
 FLTK_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) --prefix=/usr \
-		--sysconfdir=/etc 
+		--sysconfdir=/etc --enable-shared --enable-threads --with-x
 
 FLTK_DEPENDENCIES = uclibc $(XSERVER) 
 

[Buildroot] svn commit: trunk/buildroot/package/fltk

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-08-27 13:19:19 -0700 (Wed, 27 Aug 2008)
New Revision: 23259

Log:
fltk: fix long help text lines

Remove comment when X isn't available while we're at it.

Modified:
   trunk/buildroot/package/fltk/Config.in


Changeset:
Modified: trunk/buildroot/package/fltk/Config.in
===================================================================
--- trunk/buildroot/package/fltk/Config.in	2008-08-27 20:19:15 UTC (rev 23258)
+++ trunk/buildroot/package/fltk/Config.in	2008-08-27 20:19:19 UTC (rev 23259)
@@ -2,9 +2,7 @@
 	bool "fltk"
 	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
-	  a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X.
+	  A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
+	  Microsoft Windows, and MacOS X.
 
 	  http://www.fltk.org/
-
-comment "fltk		- disabled (requires Xorg(7))"
-	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)

[Buildroot] svn commit: trunk/buildroot/package/fltk

[Hamish Moffatt]

On Wed, Aug 27, 2008 at 01:19:19PM -0700, jacmet at uclibc.org wrote:
> Log:
> fltk: fix long help text lines
> 
> Remove comment when X isn't available while we're at it.
[..]
> -
> -comment "fltk		- disabled (requires Xorg(7))"
> -	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
> 

I think those comments are kind of helpful. Otherwise, if you know a
package exists but can't find it in menuconfig, you need to open up
Config.in to find the dependencies.

Alternatively the package could use select instead of depends.


Hamish
-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>

[Buildroot] svn commit: trunk/buildroot/package/fltk

[Peter Korsgaard]

>>>>> "Hamish" == Hamish Moffatt <hamish@cloud.net.au> writes:

Hi,

 >> -comment "fltk		- disabled (requires Xorg(7))"
 >> -	depends on !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)
 >> 

 Hamish> I think those comments are kind of helpful. Otherwise, if you know a
 Hamish> package exists but can't find it in menuconfig, you need to open up
 Hamish> Config.in to find the dependencies.

Sometimes they are, but having tons of those lines listed for all X
programs when you haven't selected X is imho not.

We should probably move X applications / libraries to it's own sub
menu.

 Hamish> Alternatively the package could use select instead of depends.

Yeah, but that wouldn't work here as there's multiple providers of X
(and anyway, including a monster like X behind your back isn't really
userfriendly either).

But in general I agree - Use select for hard dependencies and only
print those comment lines for stuff like toolchain settings (locales,
wchar, ..).

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/fltk

[Daniel Laird]

I think that generally the package directory is over populated.
I would like to see a rule along the lines of:
SubMenu Entry = package/subdir
i.e 
package/base (minimum packages for uclibc)
package/x11r7 (X11r7 drivers)
package/xapps (x applications (only x))
package/utils (linux utilities)
package/network (network utilities)
package/block (block drivers etc like MTD
package/audio (alsa etc)
package/java (Already there)
package/xmlutils (libxml2 etc)
package/games (games)
package/graphics (GTK/QT/DirectFB packages)

I think 300 ish packages in one directory is a bit too much.
Each of these subdirs pretty much maps to a current menu entry
package/Config.in would become smaller and simpler

What do people think?
Dan

-- 
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package-fltk-tp19189068p19195469.html
Sent from the BuildRoot mailing list archive at Nabble.com.

[Buildroot] svn commit: trunk/buildroot/package/fltk

[Hamish Moffatt]

On Thu, Aug 28, 2008 at 07:02:09AM +0200, Peter Korsgaard wrote:
> But in general I agree - Use select for hard dependencies and only
> print those comment lines for stuff like toolchain settings (locales,
> wchar, ..).

Speaking of wchar and locales, do these work well enough in uClibc to
enable them? I noticed that the latest procps requires wchar, but I have
it disabled because in the past it broke floating point string
conversions in uClibc. Or maybe it was locales that caused that.
I am planning to write a patch for procps to make wchar optional.

Hamish
-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>

[Buildroot] svn commit: trunk/buildroot/package/fltk

[Hamish Moffatt]

On Thu, Aug 28, 2008 at 07:02:09AM +0200, Peter Korsgaard wrote:
>  Hamish> I think those comments are kind of helpful. Otherwise, if you know a
>  Hamish> package exists but can't find it in menuconfig, you need to open up
>  Hamish> Config.in to find the dependencies.
> 
> Sometimes they are, but having tons of those lines listed for all X
> programs when you haven't selected X is imho not.

That's fair.

> We should probably move X applications / libraries to it's own sub
> menu.

Good solution, then all the X applications could be disabled and
replaced with a single comment if X libraries are not enabled.

>  Hamish> Alternatively the package could use select instead of depends.
> 
> Yeah, but that wouldn't work here as there's multiple providers of X
> (and anyway, including a monster like X behind your back isn't really
> userfriendly either).

Very true!

thanks
Hamish

-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>