From 02645c3876604612507880ae53603426a9cf25be Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sat, 24 Apr 2010 23:51:50 +0200 Subject: massive PKG_SECTION adjustments --- package/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 00bfea228..02aa8f520 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.6 PKG_RELEASE:= 1 PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server -PKG_SECTION:= x11 +PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ libfontenc xkeyboard-config xkbcomp libxau libxaw \ libxmu libxpm libxrender libxt libxxf86dga libxext \ -- cgit v1.2.3 From 6753dd303c33fcd2e7ecf35e5d1c785c4726105b Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sun, 20 Jun 2010 14:13:50 +0200 Subject: libXaw: fix PKG_template invocation For the sake of simplicity, we should stick to ${PKG_NAME} here, not the hard-coded lower-case variant of it. This way one has to stick to the original casing of the package name when specifying as dependency, but that's in fact more straight forward than always having to lookup the PKG_template invocation in question. --- package/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 5ec3e3aff..17ad6e8b9 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ - libfontenc xkeyboard-config xkbcomp libxau libxaw \ + libfontenc xkeyboard-config xkbcomp libxau libXaw \ libxmu libxpm libxrender libxt libxxf86dga libxext \ libxdmcp libxv libsm libice libx11 PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ -- cgit v1.2.3 From dffb97743b7b8c5611f7b5ac24ceaa30c3caa92c Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sun, 13 Jun 2010 03:41:50 +0200 Subject: xorg-server: enable glx along with dri --- package/xorg-server/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 17ad6e8b9..07a2c8ed5 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -46,7 +46,6 @@ CONFIGURE_ARGS+= \ --enable-dpms \ --disable-aiglx \ --disable-config-hal \ - --disable-glx \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -65,9 +64,9 @@ CONFIGURE_ARGS+= \ --with-vendor-web="http://openadk.org" ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -CONFIGURE_ARGS+= --enable-dri --enable-dri2 +CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx else -CONFIGURE_ARGS+= --disable-dri --disable-dri2 +CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx endif ifeq (${ADK_LINUX_MIPS64_LEMOTE},y) -- cgit v1.2.3 From d3576611f3c7811bc0dd29ec92b953dbccded3cc Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sun, 20 Jun 2010 14:01:24 +0200 Subject: xorg-server: fix dri dependencies These *proto packages may be used as PKG_BUILDDEP only, as they actually don't define a real package (missing PKG_template in Makefile). This wasn't a fatal bug, just pkgmaker complaining about it. --- package/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 07a2c8ed5..554f84ba3 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -19,7 +19,7 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ libpciaccess openssl xf86dgaproto ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib -PKG_DEPENDS+= xf86driproto glproto dri2proto mesalib +PKG_DEPENDS+= mesalib endif PKG_URL:= http://www.x.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ -- cgit v1.2.3 From f26175596bc6aa74275ced4134ec691164988085 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Jun 2010 21:05:28 +0200 Subject: fix broken output in log --- .../xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 70bd7b279..ccbe060a4 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -38,7 +38,7 @@ return FALSE; } #endif -+ xf86Msg(X_INFO,"%s: ioBase 0x%lx\n", (unsigned long)ioBase); ++ xf86Msg(X_INFO,"ioBase 0x%lx\n", (unsigned long)ioBase); } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) -- cgit v1.2.3 From 47e110abbf0d3142d737e753833d0d6239965b2a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 22 Jun 2010 13:46:25 +0200 Subject: fix package names and package flavour dependencies ipkg does not allow package names with uppercase, so revert some of phil changes. dependency handling of package flavours were broken, because of a chicken and egg problem. implement a new variable (PKGFS_XXX) containing flavour dependent package dependencies. --- package/xorg-server/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 554f84ba3..12ee831e1 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ - libfontenc xkeyboard-config xkbcomp libxau libXaw \ + libfontenc xkeyboard-config xkbcomp libxau libxaw \ libxmu libxpm libxrender libxt libxxf86dga libxext \ libxdmcp libxv libsm libice libx11 PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ @@ -19,7 +19,6 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ libpciaccess openssl xf86dgaproto ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib -PKG_DEPENDS+= mesalib endif PKG_URL:= http://www.x.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ @@ -29,6 +28,7 @@ PKG_TARGET_DEPENDS:= !foxboard CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS:= WITH_DRI +PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support include $(TOPDIR)/mk/package.mk -- cgit v1.2.3 From da28ccc6f848695609d32090142f1b4af0e27b17 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 6 Jul 2010 12:31:39 +0200 Subject: massive whitespace cleanup (EOL), suggested by j.seitter --- package/xorg-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xorg-server') diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 12ee831e1..6659e04db 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -78,7 +78,7 @@ post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions - $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ $(IDIR_XORG_SERVER)/usr/lib/xorg/ -- cgit v1.2.3