Skip to contentSkip to conversation

John Voltz changes part 2 (blackbox, cairo and cups)

PATCH New Thiago A. Corrêa 2 participants 3 messages Feb 12, 2008 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 John Voltz changes part 2 (blackbox, cairo and cups)

This is more of his changes:

adds blackbox to the window managers list

Please don't forget to do svn add svn add package/blackbox/

-----

cairo fixes and version bump

Please don't forget to do svn add package/cairo/cairo-1.4.14-libdir-la.patch

-----

add cups

Please don't forget to do svn add package/cups
-------------- next part --------------
A non-text attachment was scrubbed...
Name: blackbox.patch
Type: text/x-patch
Size: 3901 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080212/af74b378/attachment-0003.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cairo.patch
Type: text/x-patch
Size: 21996 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080212/af74b378/attachment-0004.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: add-cups.patch
Type: text/x-patch
Size: 3095 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080212/af74b378/attachment-0005.bin

#2 lore raw

PATCH 1/1 John Voltz changes part 2 (blackbox, cairo and cups)

Quoted 40 lines · Thiago A. Corr?a

This is more of his changes:

adds blackbox to the window managers list

Please don't forget to do svn add svn add package/blackbox/

-----

cairo fixes and version bump

Please don't forget to do svn add package/cairo/cairo-1.4.14-libdir-la.patch

-----

add cups

Please don't forget to do svn add package/cups

Index: package/Config.in
===================================================================

Config.in +0 -0
@@ -380,6 +380,7 @@

comment "X Window managers"
source "package/matchbox/Config.in"
source "package/metacity/Config.in"
+source "package/blackbox/Config.in"
comment "X applications"
source "package/dillo/Config.in"
source "package/rdesktop/Config.in"
Index: package/blackbox/blackbox-0.70.1-configure.patch
===================================================================

blackbox/blackbox-0.70.1-configure.patch +5 -0
@@ -0,0 +1,15 @@
+--- a/configure	2005-11-03 03:27:16.000000000 -0500
++++ b/configure	2008-02-02 23:25:25.000000000 -0500
+@@ -1980,12 +1980,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+ 
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"

blackbox/blackbox-0.70.1-configure.patch line 15

Quoted 10 lines
blackbox/blackbox-0.70.1-configure.patch +10 -0
+ 
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'

I'll just comment on this single package, vicarious for the rest. Of course these are only my personal POV.

Quoted 6 lines

Index: package/blackbox/Config.in
===================================================================

blackbox/Config.in +1 -0
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_BLACKBOX

blackbox/Config.in line 11

Quoted 10 lines
blackbox/Config.in +10 -0
+	bool "blackbox"
+	default n
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+	help
+	  Blackbox is a fast, lightweight window manager for the X Window System.
+
+	  http://blackboxwm.sourceforge.net/
+
+comment "blackbox		- disabled (requires Xorg(7))"
+	depends !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)

Why would this not work with non-Xorg based X11-servers? That's wrong. Putting such stuff into comments is just ugly, imo.
Of course you do not need a CXX cross-compiler to build it, or do you and the deps are just wrong once more?

Quoted 15 lines

Index: package/blackbox/blackbox.mk
===================================================================

blackbox/blackbox.mk +10 -0
@@ -0,0 +1,62 @@
+#############################################################
+#
+# blackbox
+#
+#############################################################
+
+BLACKBOX_VERSION=0.70.1
+BLACKBOX_SOURCE=blackbox-$(BLACKBOX_VERSION).tar.bz2
+BLACKBOX_SITE=http://superb-west.dl.sourceforge.net/sourceforge/blackboxwm/
+BLACKBOX_DIR=$(BUILD_DIR)/blackbox-$(BLACKBOX_VERSION)

blackbox/blackbox.mk line 20

Quoted 10 lines
blackbox/blackbox.mk +10 -0
+BLACKBOX_CAT:=$(BZCAT)
+
+$(DL_DIR)/$(BLACKBOX_SOURCE):
+	$(WGET) -P $(DL_DIR) $(BLACKBOX_SITE)/$(BLACKBOX_SOURCE)
+
+$(BLACKBOX_DIR)/.unpacked: $(DL_DIR)/$(BLACKBOX_SOURCE)
+	$(BLACKBOX_CAT) $(DL_DIR)/$(BLACKBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(BLACKBOX_DIR) package/blackbox/ \*.patch
+	$(CONFIG_UPDATE) $(BLACKBOX_DIR)
+	touch $(BLACKBOX_DIR)/.unpacked

brittle, bloated and big. touch $@ would have been a sensible thing to do.

Quoted 8 lines
blackbox/blackbox.mk +8 -0
+
+$(BLACKBOX_DIR)/.configured: $(BLACKBOX_DIR)/.unpacked
+	(cd $(BLACKBOX_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \

blackbox/blackbox.mk line 38

Quoted 10 lines
blackbox/blackbox.mk +10 -0
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--x-includes=$(STAGING_DIR)/usr/include/X11 \
+		--x-libraries=$(STAGING_DIR)/usr/lib \
+	)
+	touch $(BLACKBOX_DIR)/.configured
+
+$(BLACKBOX_DIR)/src/blackbox: $(BLACKBOX_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(BLACKBOX_DIR)

wrong.

blackbox/blackbox.mk line 42

Quoted 4 lines
blackbox/blackbox.mk +4 -0
+
+$(BLACKBOX_DIR)/.installed: $(BLACKBOX_DIR)/src/blackbox
+	$(MAKE) -C $(BLACKBOX_DIR) DESTDIR=$(TARGET_DIR) install
+	touch $(BLACKBOX_DIR)/.installed

ugly. $@. and additionally wrong since it doesn't strip

blackbox/blackbox.mk line 51

Quoted 9 lines
blackbox/blackbox.mk +9 -0
+
+blackbox: uclibc $(XSERVER) $(BLACKBOX_DIR)/.installed
+
+blackbox-source: $(DL_DIR)/$(BLACKBOX_SOURCE)
+
+blackbox-clean:
+	@if [ -d $(BLACKBOX_DIR)/Makefile ]; then \
+		$(MAKE) -C $(BLACKBOX_DIR) clean; \
+	fi

Lines like those 3 above are just sad.

blackbox/blackbox.mk line 60

Quoted 9 lines
blackbox/blackbox.mk +9 -0
+
+blackbox-dirclean:
+	rm -rf $(BLACKBOX_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_BLACKBOX)),y)

bloated, superfluous and ugly.
And yes, i'm grumpy and annoyed by now.
[snip]

#3 lore raw

PATCH 1/1 John Voltz changes part 2 (blackbox, cairo and cups)

Hmmm ok. I agree to some of your comments :)
I wasn't really looking at that, was more interested in sorting out the 527k lines of diff, making sure it applies and causes no revert on recent commits *smile*

Then, drop that package and I will check out again on a second pass That's the beauty in spliting it up.

Quoted 161 lines · Bernhard Fischer
Quoted 40 lines · Thiago A. Corr?a

This is more of his changes:

adds blackbox to the window managers list

Please don't forget to do svn add svn add package/blackbox/

-----

cairo fixes and version bump

Please don't forget to do svn add package/cairo/cairo-1.4.14-libdir-la.patch

-----

add cups

Please don't forget to do svn add package/cups

Index: package/Config.in
===================================================================

Config.in (working copy) renamed from Config.in (revision 20993) +0 -0
@@ -380,6 +380,7 @@

comment "X Window managers"
source "package/matchbox/Config.in"
source "package/metacity/Config.in"
+source "package/blackbox/Config.in"
comment "X applications"
source "package/dillo/Config.in"
source "package/rdesktop/Config.in"
Index: package/blackbox/blackbox-0.70.1-configure.patch
===================================================================

blackbox/blackbox-0.70.1-configure.patch (revision 0) +5 -0
@@ -0,0 +1,15 @@
+--- a/configure       2005-11-03 03:27:16.000000000 -0500
++++ b/configure       2008-02-02 23:25:25.000000000 -0500
+@@ -1980,12 +1980,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+
+ test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"

blackbox/blackbox-0.70.1-configure.patch (revision 0) line 15

Quoted 10 lines
blackbox/blackbox-0.70.1-configure.patch (revision 0) +10 -0
+
+-CPPFLAGS="$CPPFLAGS -I$prefix/include"
+-LDFLAGS="$LDFLAGS -L$prefix/lib"
+-if test "x$prefix" != "x/usr/local"; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'

I'll just comment on this single package, vicarious for the rest. Of course these are only my personal POV.

Quoted 6 lines

Index: package/blackbox/Config.in
===================================================================

blackbox/Config.in (revision 0) +1 -0
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_BLACKBOX

blackbox/Config.in (revision 0) line 11

Quoted 10 lines
blackbox/Config.in (revision 0) +10 -0
+      bool "blackbox"
+      default n
+      depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+      help
+        Blackbox is a fast, lightweight window manager for the X Window System.
+
+        http://blackboxwm.sourceforge.net/
+
+comment "blackbox             - disabled (requires Xorg(7))"
+      depends !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7)

Why would this not work with non-Xorg based X11-servers? That's wrong. Putting such stuff into comments is just ugly, imo.
Of course you do not need a CXX cross-compiler to build it, or do you and the deps are just wrong once more?

Quoted 15 lines

Index: package/blackbox/blackbox.mk
===================================================================

blackbox/blackbox.mk (revision 0) +10 -0
@@ -0,0 +1,62 @@
+#############################################################
+#
+# blackbox
+#
+#############################################################
+
+BLACKBOX_VERSION=0.70.1
+BLACKBOX_SOURCE=blackbox-$(BLACKBOX_VERSION).tar.bz2
+BLACKBOX_SITE=http://superb-west.dl.sourceforge.net/sourceforge/blackboxwm/
+BLACKBOX_DIR=$(BUILD_DIR)/blackbox-$(BLACKBOX_VERSION)

blackbox/blackbox.mk (revision 0) line 20

Quoted 10 lines
blackbox/blackbox.mk (revision 0) +10 -0
+BLACKBOX_CAT:=$(BZCAT)
+
+$(DL_DIR)/$(BLACKBOX_SOURCE):
+      $(WGET) -P $(DL_DIR) $(BLACKBOX_SITE)/$(BLACKBOX_SOURCE)
+
+$(BLACKBOX_DIR)/.unpacked: $(DL_DIR)/$(BLACKBOX_SOURCE)
+      $(BLACKBOX_CAT) $(DL_DIR)/$(BLACKBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+      toolchain/patch-kernel.sh $(BLACKBOX_DIR) package/blackbox/ \*.patch
+      $(CONFIG_UPDATE) $(BLACKBOX_DIR)
+      touch $(BLACKBOX_DIR)/.unpacked

brittle, bloated and big. touch $@ would have been a sensible thing to do.

Quoted 8 lines
blackbox/blackbox.mk (revision 0) +8 -0
+
+$(BLACKBOX_DIR)/.configured: $(BLACKBOX_DIR)/.unpacked
+      (cd $(BLACKBOX_DIR); rm -rf config.cache; \
+              $(TARGET_CONFIGURE_OPTS) \
+              $(TARGET_CONFIGURE_ARGS) \
+              ./configure \
+              --target=$(GNU_TARGET_NAME) \
+              --host=$(GNU_TARGET_NAME) \

blackbox/blackbox.mk (revision 0) line 38

Quoted 10 lines
blackbox/blackbox.mk (revision 0) +10 -0
+              --build=$(GNU_HOST_NAME) \
+              --prefix=/usr \
+              --sysconfdir=/etc \
+              --x-includes=$(STAGING_DIR)/usr/include/X11 \
+              --x-libraries=$(STAGING_DIR)/usr/lib \
+      )
+      touch $(BLACKBOX_DIR)/.configured
+
+$(BLACKBOX_DIR)/src/blackbox: $(BLACKBOX_DIR)/.configured
+      $(MAKE) CC=$(TARGET_CC) -C $(BLACKBOX_DIR)

wrong.

blackbox/blackbox.mk (revision 0) line 42

Quoted 4 lines
blackbox/blackbox.mk (revision 0) +4 -0
+
+$(BLACKBOX_DIR)/.installed: $(BLACKBOX_DIR)/src/blackbox
+      $(MAKE) -C $(BLACKBOX_DIR) DESTDIR=$(TARGET_DIR) install
+      touch $(BLACKBOX_DIR)/.installed

ugly. $@. and additionally wrong since it doesn't strip

blackbox/blackbox.mk (revision 0) line 51

Quoted 9 lines
blackbox/blackbox.mk (revision 0) +9 -0
+
+blackbox: uclibc $(XSERVER) $(BLACKBOX_DIR)/.installed
+
+blackbox-source: $(DL_DIR)/$(BLACKBOX_SOURCE)
+
+blackbox-clean:
+      @if [ -d $(BLACKBOX_DIR)/Makefile ]; then \
+              $(MAKE) -C $(BLACKBOX_DIR) clean; \
+      fi

Lines like those 3 above are just sad.

blackbox/blackbox.mk (revision 0) line 60

Quoted 9 lines
blackbox/blackbox.mk (revision 0) +9 -0
+
+blackbox-dirclean:
+      rm -rf $(BLACKBOX_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_BLACKBOX)),y)

bloated, superfluous and ugly.
And yes, i'm grumpy and annoyed by now.
[snip]