* [Buildroot] svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc...
@ 2007-02-04 19:47 aldot at uclibc.org
2007-02-05 9:59 ` Daniel Laird
0 siblings, 1 reply; 3+ messages in thread
From: aldot at uclibc.org @ 2007-02-04 19:47 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-02-04 11:47:41 -0800 (Sun, 04 Feb 2007)
New Revision: 17769
Log:
- the $(XSERVER) target can be provided by different X server impls. Adjust users
- rdesktop needs an xserver impl
Modified:
trunk/buildroot/package/Makefile.in
trunk/buildroot/package/cairo/cairo.mk
trunk/buildroot/package/dillo/dillo.mk
trunk/buildroot/package/libgtk12/libgtk12.mk
trunk/buildroot/package/libgtk2/libgtk2.mk
trunk/buildroot/package/metacity/metacity.mk
trunk/buildroot/package/pango/pango.mk
trunk/buildroot/package/rdesktop/rdesktop.mk
trunk/buildroot/package/rxvt/rxvt.mk
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/Makefile.in 2007-02-04 19:47:41 UTC (rev 17769)
@@ -111,3 +111,16 @@
TARGET_CONFIGURE_OPTS+=CXX=""
endif
+# X Windowing system
+
+XSERVER:=
+ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
+XSERVER+=tinyx
+endif
+ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
+XSERVER+=xorg
+endif
+ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
+XSERVER+=xggi
+endif
+
Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/cairo/cairo.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -134,7 +134,7 @@
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libcairo.so.2.*
touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
-cairo: uclibc gettext libintl pkgconfig libglib2 xorg $(TARGET_DIR)/lib/libcairo.so.2.9.3
+cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo-clean:
rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)
Modified: trunk/buildroot/package/dillo/dillo.mk
===================================================================
--- trunk/buildroot/package/dillo/dillo.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/dillo/dillo.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -38,7 +38,7 @@
$(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install
touch $(DILLO_DIR)/.installed
-dillo: uclibc xorg libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
+dillo: uclibc $(XSERVER) libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
Modified: trunk/buildroot/package/libgtk12/libgtk12.mk
===================================================================
--- trunk/buildroot/package/libgtk12/libgtk12.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/libgtk12/libgtk12.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -85,7 +85,7 @@
$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
-libgtk12: uclibc libglib12 xorg $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
+libgtk12: uclibc libglib12 $(XSERVER) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
libgtk12-clean:
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*
Modified: trunk/buildroot/package/libgtk2/libgtk2.mk
===================================================================
--- trunk/buildroot/package/libgtk2/libgtk2.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/libgtk2/libgtk2.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -150,7 +150,7 @@
cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0
touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
-libgtk2: uclibc png jpeg tiff xorg libglib2 \
+libgtk2: uclibc png jpeg tiff $(XSERVER) libglib2 \
cairo pango atk $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
libgtk2-clean:
Modified: trunk/buildroot/package/metacity/metacity.mk
===================================================================
--- trunk/buildroot/package/metacity/metacity.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/metacity/metacity.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -138,7 +138,7 @@
(cd $(TARGET_DIR)/usr/share/themes; rm -rf Atlanta; ln -s Clearlooks Atlanta)
cp -a package/metacity/Xsession $(TARGET_DIR)/etc/X11/
-metacity: uclibc zlib xorg libgtk2 $(TARGET_DIR)/lib/*metacity*.so
+metacity: uclibc zlib $(XSERVER) libgtk2 $(TARGET_DIR)/lib/*metacity*.so
metacity-clean:
-$(MAKE) -C $(METACITY_DIR) clean
Modified: trunk/buildroot/package/pango/pango.mk
===================================================================
--- trunk/buildroot/package/pango/pango.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/pango/pango.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -154,7 +154,7 @@
cp package/pango/pangox.aliases $(TARGET_DIR)/etc/pango/
touch -c $(TARGET_DIR)/lib/libpango-1.0.so.0
-pango: uclibc gettext libintl pkgconfig libglib2 xorg cairo \
+pango: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) cairo \
$(TARGET_DIR)/lib/libpango-1.0.so.0
pango-clean:
Modified: trunk/buildroot/package/rdesktop/rdesktop.mk
===================================================================
--- trunk/buildroot/package/rdesktop/rdesktop.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/rdesktop/rdesktop.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -38,7 +38,7 @@
cp $(RDESKTOP_DIR)/rdesktop $(TARGET_DIR)/usr/bin
touch $(RDESKTOP_DIR)/.installed
-rdesktop: uclibc xorg openssl $(RDESKTOP_DIR)/.installed
+rdesktop: uclibc openssl $(XSERVER) $(RDESKTOP_DIR)/.installed
rdesktop-source: $(DL_DIR)/$(RDESKTOP_SOURCE)
Modified: trunk/buildroot/package/rxvt/rxvt.mk
===================================================================
--- trunk/buildroot/package/rxvt/rxvt.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/rxvt/rxvt.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -63,12 +63,7 @@
cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin
(cd $(TARGET_DIR)/usr/X11R6/bin; ln -fs rxvt xterm)
-ifeq ($(strip $(BR2_PACKAGE_TINYX)),y)
-rxvt: tinyx $(TARGET_DIR)/usr/X11R6/bin/rxvt
-endif
-ifeq ($(strip $(BR2_PACKAGE_XORG)),y)
-rxvt: xorg $(TARGET_DIR)/usr/X11R6/bin/rxvt
-endif
+rxvt: $(XSERVER) $(TARGET_DIR)/usr/X11R6/bin/rxvt
rxvt-clean:
rm -f $(TARGET_DIR)/usr/X11R6/bin/rxvt
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-02-04 19:20:45 UTC (rev 17768)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-02-04 19:47:41 UTC (rev 17769)
@@ -44,9 +44,9 @@
DEJAVU_DIR:=$(BUILD_DIR)/dejavu-ttf-$(DEJAVU_VERSION)
# Install Xorg xserver
-XSERVER:=Xorg
-XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER)
-TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER)
+XSERVER_BINARY:=Xorg
+XORG_XSERVER:=$(XORG_DIR)/programs/Xserver/$(XSERVER_BINARY)
+TARGET_XSERVER:=$(XORG_BINX)/$(XSERVER_BINARY)
# figure out Xorg's idea of corresponding architecture name
ifeq ($(BR2_alpha),y)
@@ -127,7 +127,7 @@
$(STRIP) $(XORG_PROGS)/$$file || /bin/true ; \
done
cp $(XORG_XSERVER) $(TARGET_XSERVER)
- (cd $(XORG_BINX); ln -snf $(XSERVER) X)
+ (cd $(XORG_BINX); ln -snf $(XSERVER_BINARY) X)
$(STRIP) $(TARGET_XSERVER)
mkdir -p $(XORG_LIBX)/modules
cp -LRf $(XORG_DIR)/exports/lib/modules/ $(XORG_LIBX)/
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc...
2007-02-04 19:47 [Buildroot] svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc aldot at uclibc.org
@ 2007-02-05 9:59 ` Daniel Laird
2007-02-05 10:57 ` [Buildroot] XSERVER [was Re: svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc...] Bernhard Fischer
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Laird @ 2007-02-05 9:59 UTC (permalink / raw)
To: buildroot
aldot wrote:
>
> Author: aldot
> Date: 2007-02-04 11:47:41 -0800 (Sun, 04 Feb 2007)
> New Revision: 17769
>
> Log:
> - the $(XSERVER) target can be provided by different X server impls.
> Adjust users
> - rdesktop needs an xserver impl
>
>
> Modified:
> trunk/buildroot/package/Makefile.in
> trunk/buildroot/package/cairo/cairo.mk
> trunk/buildroot/package/dillo/dillo.mk
> trunk/buildroot/package/libgtk12/libgtk12.mk
> trunk/buildroot/package/libgtk2/libgtk2.mk
> trunk/buildroot/package/metacity/metacity.mk
> trunk/buildroot/package/pango/pango.mk
> trunk/buildroot/package/rdesktop/rdesktop.mk
> trunk/buildroot/package/rxvt/rxvt.mk
> trunk/buildroot/package/xorg/xorg.mk
>
> ...
>
Cool, I posted a thread the other day about how to deal with packages that
could be configured with X and without X(in the case where you use DirectFB
for example)
I presume we could add a DirectFB option to the list of XSERVERS: (as there
is a DirectFB Xserver)
Secondly, Would you also have anything against if XSERVERS empty then
configure packages as --without-x (or equivalent)
Then we could also check if DirectFB then use --enable-directfb for packages
that care.
What do you think.
--
View this message in context: http://www.nabble.com/svn-commit%3A-trunk-buildroot-package%3A-cairo-dillo-libgtk12-libgtk2-metacity-p-etc...-tf3171054.html#a8803519
Sent from the BuildRoot mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] XSERVER [was Re: svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc...]
2007-02-05 9:59 ` Daniel Laird
@ 2007-02-05 10:57 ` Bernhard Fischer
0 siblings, 0 replies; 3+ messages in thread
From: Bernhard Fischer @ 2007-02-05 10:57 UTC (permalink / raw)
To: buildroot
On Mon, Feb 05, 2007 at 01:59:38AM -0800, Daniel Laird wrote:
>
>
>aldot wrote:
>>
>> Author: aldot
>> Date: 2007-02-04 11:47:41 -0800 (Sun, 04 Feb 2007)
>> New Revision: 17769
>>
>> Log:
>> - the $(XSERVER) target can be provided by different X server impls.
>> Adjust users
>> - rdesktop needs an xserver impl
>>
>>
>> Modified:
>> trunk/buildroot/package/Makefile.in
>> trunk/buildroot/package/cairo/cairo.mk
>> trunk/buildroot/package/dillo/dillo.mk
>> trunk/buildroot/package/libgtk12/libgtk12.mk
>> trunk/buildroot/package/libgtk2/libgtk2.mk
>> trunk/buildroot/package/metacity/metacity.mk
>> trunk/buildroot/package/pango/pango.mk
>> trunk/buildroot/package/rdesktop/rdesktop.mk
>> trunk/buildroot/package/rxvt/rxvt.mk
>> trunk/buildroot/package/xorg/xorg.mk
>>
>> ...
>>
>Cool, I posted a thread the other day about how to deal with packages that
I must have missed that thread, sorry.
>could be configured with X and without X(in the case where you use DirectFB
>for example)
>I presume we could add a DirectFB option to the list of XSERVERS: (as there
>is a DirectFB Xserver)
>
>Secondly, Would you also have anything against if XSERVERS empty then
>configure packages as --without-x (or equivalent)
>
>Then we could also check if DirectFB then use --enable-directfb for packages
>that care.
>
>What do you think.
(1) update directfb t othe current, stable (thus hopefully supported)
version.
DirectFB used to change their API far too fast last time i looked at
it, so it was extremely inconvenient to use. Perhaps this has changed
since then -- it was a couple of years back, two, or maybe three,
dunno.
(2) flesh-out the directfb config to allow for (relatively) fine-grained
configuration: Just bare core / some nifty other stuff that may be
useful.
(3) update XSERVER accordingly
(4) provide an $(ENABLE_DIRECTFB) or the like for use by interrested packages
etc, etc.
The order is significant here, at least from my POV. _First_ fix the
directfb package not to use ancient, deprecated stuff.. YMMV
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-02-05 10:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-04 19:47 [Buildroot] svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc aldot at uclibc.org
2007-02-05 9:59 ` Daniel Laird
2007-02-05 10:57 ` [Buildroot] XSERVER [was Re: svn commit: trunk/buildroot/package: cairo dillo libgtk12 libgtk2 metacity p etc...] Bernhard Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox