libdrm: bump version to 2.4.19
PATCH 1/16 libdrm: bump version to 2.4.19
Also adds proper dependency information to stop build errors.
--- package/libdrm/Config.in | 7 +++++++ package/libdrm/libdrm.mk | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-)
package/libdrm/Config.in +7 -0
@@ -1,5 +1,12 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XPROTO_GLPROTO + select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO + select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XLIB_LIBXMU + select BR2_PACKAGE_XPROTO_DRI2PROTO + select BR2_PACKAGE_PTHREAD_STUBS help Direct Rendering Manager
package/libdrm/libdrm.mk +3 -1
@@ -3,7 +3,7 @@ # libdrm # ############################################################# -LIBDRM_VERSION = 2.4.11 +LIBDRM_VERSION = 2.4.19 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/ LIBDRM_AUTORECONF = NO
@@ -11,4 +11,6 @@ LIBDRM_LIBTOOL_PATCH = NO LIBDRM_INSTALL_STAGING = YES LIBDRM_INSTALL_TARGET = YES +LIBDRM_DEPENDENCIES = xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xproto_dri2proto pthread-stubs + $(eval $(call AUTOTARGETS,package,libdrm))
Signature · 1 line
1.7.0
PATCH 1/16 libdrm: bump version to 2.4.19
Still learning how to use got send-email, was hoping it would let me write some covering words, I'm sure it can, just need to work out the option.
This patch series builds on Paulius's work on x11r7.
It bumps the version of a number of patches (including Paul Jones' libdrm bump), but it also changes over to use Kernel Mode Settings for the graphics drivers. Not sure how to specify in a package that a certain kernel version is needed.
The patch series is also available via git at:
git://gitorious.org/willw-buildroot/willw-buildroot.git x11r75patches
Will
PATCH 1/16 libdrm: bump version to 2.4.19
Quoted 3 lines · Will Wagner
Still learning how to use got send-email, was hoping it would let me write some covering words, I'm sure it can, just need to work out the option.
I am using StGit for managing my patches. It also supports patch sending and has option to add/edit cover letter.
Quoted 18 lines
This patch series builds on Paulius's work on x11r7.
It bumps the version of a number of patches (including Paul Jones' libdrm bump), but it also changes over to use Kernel Mode Settings for the graphics drivers. Not sure how to specify in a package that a certain kernel version is needed.
The patch series is also available via git at:
git://gitorious.org/willw-buildroot/willw-buildroot.gitx11r75patchesWill
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 1/16 libdrm: bump version to 2.4.19
Quoted 2 lines · On Thu, 01 Apr 2010 22:08:25 +0300 Paulius Zaleckas…
I am using StGit for managing my patches. It also supports patch sending and has option to add/edit cover letter.
Git also has one :
git send-email --compose
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 2/16 pixman: bump version
In reply to Will Wagner--- package/pixman/pixman.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/pixman/pixman.mk +1 -1
@@ -3,7 +3,7 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.17.4 +PIXMAN_VERSION = 0.17.6 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz PIXMAN_SITE = http://cairographics.org/releases/ PIXMAN_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 2/16 pixman: bump version
Pixman 0.18.0 has been released today. One more bump ? :)
Quoted 26 lines · Will Wagner
---
?package/pixman/pixman.mk | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)package/pixman/pixman.mk +0
-0@@ -3,7 +3,7 @@?# pixman
?# ?################################################################################package/pixman/pixman.mk +1
-1-PIXMAN_VERSION = 0.17.4 +PIXMAN_VERSION = 0.17.6?PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
?PIXMAN_SITE = http://cairographics.org/releases/
?PIXMAN_AUTORECONF = NO
--
1.7.0_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/16 pixman: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Lionel" == Lionel Landwerlin <[email protected]> writes:
Lionel> Pixman 0.18.0 has been released today. One more bump ? :)
Yes please - If it works.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/16 pixman: bump version
In reply to Will WagnerQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> ---
Will> package/pixman/pixman.mk | 2 +-
Will> 1 files changed, 1 insertions(+), 1 deletions(-)
Committed, thanks - Don't forget to sign off on your patches in the future (-s option on git commit or git format-patch).
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/16 mesa3d: bump version and convert to autotools
In reply to Will WagnerNote this version requires a recent kernel with KMS support as it is currently configured
--- package/x11r7/mesa3d/Config.in | 6 +- package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch | 12 --- package/x11r7/mesa3d/mesa3d.mk | 98 ++------------------- 3 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch
package/x11r7/mesa3d/Config.in +3 -3
@@ -1,12 +1,12 @@ config BR2_PACKAGE_MESA3D bool "Mesa 3D Graphics Library" select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBPCIACCESS select BR2_PACKAGE_XLIB_LIBXDAMAGE + select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XPROTO_DRI2PROTO select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_EXPAT depends on BR2_PACKAGE_XSERVER_XORG_SERVER depends on BR2_INSTALL_LIBSTDCPP help
package/x11r7/mesa3d/mesa3d-gen_matypes-fix.patch deleted +0 -12
@@ -1,12 +0,0 @@ -diff -ruN Mesa-7.2.orig/src/mesa/x86/Makefile Mesa-7.2/src/mesa/x86/Makefile ---- Mesa-7.2.orig/src/mesa/x86/Makefile 2008-08-25 16:46:47.000000000 +0200 -+++ Mesa-7.2/src/mesa/x86/Makefile 2009-05-08 08:46:34.000000000 +0200 -@@ -21,7 +21,7 @@ - - - gen_matypes: gen_matypes.c -- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes -+ $(CC_FOR_BUILD) $(INCLUDE_DIRS) $(CFLAGS_FOR_BUILD) gen_matypes.c -o gen_matypes - - # need some special rules here, unfortunately - matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
package/x11r7/mesa3d/mesa3d.mk +8 -90
105 lines not on this page · raw message
Signature · 1 line
1.7.0
PATCH 3/16 mesa3d: bump version and convert to autotools
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Note this version requires a recent kernel with KMS support as it is Will> currently configured
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/16 correct name of xapp_xinput.mk
In reply to Will Wagner--- package/x11r7/xapp_xinput/xapp_xbacklight.mk | 13 ------------- package/x11r7/xapp_xinput/xapp_xinput.mk | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 package/x11r7/xapp_xinput/xapp_xbacklight.mk create mode 100644 package/x11r7/xapp_xinput/xapp_xinput.mk
package/x11r7/xapp_xinput/xapp_xbacklight.mk deleted +0 -13
@@ -1,13 +0,0 @@ -################################################################################ -# -# xapp_xinput -- xinput -# -################################################################################ - -XAPP_XINPUT_VERSION = 1.5.0 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 -XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XINPUT_AUTORECONF = NO -XAPP_XINPUT_DEPENDENCIES = xlib_libX11 - -$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
package/x11r7/xapp_xinput/xapp_xinput.mk new file +13 -0
@@ -0,0 +1,13 @@ +################################################################################ +# +# xapp_xinput -- xinput +# +################################################################################ + +XAPP_XINPUT_VERSION = 1.5.0 +XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 +XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XINPUT_AUTORECONF = NO +XAPP_XINPUT_DEPENDENCIES = xlib_libX11 + +$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
Signature · 1 line
1.7.0
PATCH 4/16 correct name of xapp_xinput.mk
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> ---
Will> package/x11r7/xapp_xinput/xapp_xbacklight.mk | 13 ------------- Will> package/x11r7/xapp_xinput/xapp_xinput.mk | 13 +++++++++++++
Committed, thanks - Please use -M option to git format-patch (and -s) so git will show it's a pure rename. That makes review easier.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/16 xlib_libXau: remove duplicate dependancies
In reply to Will Wagner--- package/x11r7/xlib_libXau/Config.in | 1 - package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)
package/x11r7/xlib_libXau/Config.in +0 -1
@@ -1,7 +1,6 @@ config BR2_PACKAGE_XLIB_LIBXAU bool "libXau" select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS help libXau 1.0.5
package/x11r7/xlib_libXau/xlib_libXau.mk +1 -1
@@ -10,7 +10,7 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_AUTORECONF = NO XLIB_LIBXAU_LIBTOOL_PATCH = NO XLIB_LIBXAU_INSTALL_STAGING = YES -XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros +XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
Signature · 1 line
1.7.0
PATCH 5/16 xlib_libXau: remove duplicate dependancies
Quoted 30 lines · On Thu, 1 Apr 2010 13:46:35 +0100 Will Wagner <[email protected]> wrote:
--- package/x11r7/xlib_libXau/Config.in | 1 - package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)package/x11r7/xlib_libXau/Config.in +0
-1@@ -1,7 +1,6 @@ config BR2_PACKAGE_XLIB_LIBXAU bool "libXau" select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS help libXau 1.0.5package/x11r7/xlib_libXau/xlib_libXau.mk +1
-1@@ -10,7 +10,7 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_AUTORECONF = NO XLIB_LIBXAU_LIBTOOL_PATCH = NO XLIB_LIBXAU_INSTALL_STAGING = YES -XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros +XLIB_LIBXAU_DEPENDENCIES = xutil_util-macros xproto_xproto XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXau))
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 5/16 xlib_libXau: remove duplicate dependancies
In reply to Will WagnerQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> ---
Will> package/x11r7/xlib_libXau/Config.in | 1 - Will> package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +-
Will> 2 files changed, 1 insertions(+), 2 deletions(-)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/16 pthread-stubs: bump version
In reply to Will Wagner--- package/x11r7/pthread-stubs/pthread-stubs.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
package/x11r7/pthread-stubs/pthread-stubs.mk +2 -1
@@ -3,10 +3,11 @@ # pthread-stubs # ############################################################# -PTHREAD_STUBS_VERSION = 0.1 +PTHREAD_STUBS_VERSION = 0.3 PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ +PTHREAD_STUBS_LIBTOOL_PATCH = NO PTHREAD_STUBS_INSTALL_STAGING = YES $(eval $(call AUTOTARGETS,package/x11r7,pthread-stubs))
Signature · 1 line
1.7.0
PATCH 6/16 pthread-stubs: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]> Will> ---
Will> package/x11r7/pthread-stubs/pthread-stubs.mk | 3 ++-
Will> 1 files changed, 2 insertions(+), 1 deletions(-)
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 7/16 xproto_dri2proto: bump version
In reply to Will Wagner--- package/x11r7/xproto_dri2proto/Config.in | 2 +- package/x11r7/xproto_dri2proto/xproto_dri2proto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xproto_dri2proto/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_XPROTO_DRI2PROTO bool "dri2proto" help - dri2proto 2.1 + dri2proto 2.3 X.Org DRI2 protocol headers
package/x11r7/xproto_dri2proto/xproto_dri2proto.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_DRI2PROTO_VERSION = 2.1 +XPROTO_DRI2PROTO_VERSION = 2.3 XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2 XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_DRI2PROTO_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 7/16 xproto_dri2proto: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]> Will> ---
Will> package/x11r7/xproto_dri2proto/Config.in | 2 +- Will> package/x11r7/xproto_dri2proto/xproto_dri2proto.mk | 2 +-
Will> 2 files changed, 2 insertions(+), 2 deletions(-)
Committed, thanks.
Will> diff --git a/package/x11r7/xproto_dri2proto/Config.in b/package/x11r7/xproto_dri2proto/Config.in Will> index 4ab5ccd..a5c82b2 100644
Will> --- a/package/x11r7/xproto_dri2proto/Config.in
Will> +++ b/package/x11r7/xproto_dri2proto/Config.in
Will> @@ -1,5 +1,5 @@
Will> config BR2_PACKAGE_XPROTO_DRI2PROTO Will> bool "dri2proto" Will> help
Will> - dri2proto 2.1
Will> + dri2proto 2.3
This is just noice without any real advantage to the users, so I removed this.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 8/16 xproto_fontcacheproto: bump version
In reply to Will Wagner--- package/x11r7/xproto_fontcacheproto/Config.in | 2 +- .../xproto_fontcacheproto/xproto_fontcacheproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xproto_fontcacheproto/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_XPROTO_FONTCACHEPROTO bool "fontcacheproto" help - fontcacheproto 0.1.2 + fontcacheproto 0.1.3 X.Org Fontcache protocol headers
package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_FONTCACHEPROTO_VERSION = 0.1.2 +XPROTO_FONTCACHEPROTO_VERSION = 0.1.3 XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2 XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_FONTCACHEPROTO_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 8/16 xproto_fontcacheproto: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]> Will> ---
Will> package/x11r7/xproto_fontcacheproto/Config.in | 2 +- Will> .../xproto_fontcacheproto/xproto_fontcacheproto.mk | 2 +-
Will> 2 files changed, 2 insertions(+), 2 deletions(-)
Committedm thanks - And same comment about Config.in as dri2proto.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 9/16 xproto_xf86miscproto: bump version
In reply to Will Wagner--- package/x11r7/xproto_xf86miscproto/Config.in | 2 +- .../xproto_xf86miscproto/xproto_xf86miscproto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xproto_xf86miscproto/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_XPROTO_XF86MISCPROTO bool "xf86miscproto" help - xf86miscproto 0.9.2 + xf86miscproto 0.9.3 X.Org XF86Misc protocol headers
package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_XF86MISCPROTO_VERSION = 0.9.2 +XPROTO_XF86MISCPROTO_VERSION = 0.9.3 XPROTO_XF86MISCPROTO_SOURCE = xf86miscproto-$(XPROTO_XF86MISCPROTO_VERSION).tar.bz2 XPROTO_XF86MISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_XF86MISCPROTO_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 9/16 xproto_xf86miscproto: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 10/16 xlib_libpciaccess: bump version
In reply to Will Wagner--- package/x11r7/xlib_libpciaccess/Config.in | 2 +- .../x11r7/xlib_libpciaccess/xlib_libpciaccess.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
package/x11r7/xlib_libpciaccess/Config.in +1 -1
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XLIB_LIBPCIACCESS bool "libpciaccess" depends on BR2_LARGEFILE help - libpciaccess 0.10.9 + libpciaccess 0.11.0 X.Org libpciaccess comment "libpciaccess requires a toolchain with LARGEFILE support"
package/x11r7/xlib_libpciaccess/xlib_libpciaccess.mk +2 -3
@@ -4,12 +4,11 @@ # ################################################################################ -XLIB_LIBPCIACCESS_VERSION = 0.10.9 +XLIB_LIBPCIACCESS_VERSION = 0.11.0 XLIB_LIBPCIACCESS_SOURCE = libpciaccess-$(XLIB_LIBPCIACCESS_VERSION).tar.bz2 XLIB_LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBPCIACCESS_AUTORECONF = NO +XLIB_LIBPCIACCESS_LIBTOOL_PATCH = NO XLIB_LIBPCIACCESS_INSTALL_STAGING = YES -XLIB_LIBPCIACCESS_DEPENDENCIES = XLIB_LIBPCIACCESS_CONF_OPT = --enable-shared --disable-static $(eval $(call AUTOTARGETS,package/x11r7,xlib_libpciaccess))
Signature · 1 line
1.7.0
PATCH 10/16 xlib_libpciaccess: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 11/16 xlib_libXfontcache: bump version
In reply to Will Wagner--- package/x11r7/xlib_libXfontcache/Config.in | 2 +- .../x11r7/xlib_libXfontcache/xlib_libXfontcache.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xlib_libXfontcache/Config.in +1 -1
@@ -4,5 +4,5 @@ config BR2_PACKAGE_XLIB_LIBXFONTCACHE select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XPROTO_FONTCACHEPROTO help - libXfontcache 1.0.4 + libXfontcache 1.0.5 X.Org Xfontcache library
package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFONTCACHE_VERSION = 1.0.4 +XLIB_LIBXFONTCACHE_VERSION = 1.0.5 XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2 XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXFONTCACHE_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 11/16 xlib_libXfontcache: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 12/16 xkeyboard-config: bump version
In reply to Will Wagner--- package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1 -1
@@ -3,7 +3,7 @@ # xkeyboard-config # ############################################################# -XKEYBOARD_CONFIG_VERSION = 1.2 +XKEYBOARD_CONFIG_VERSION = 1.8 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 XKEYBOARD_CONFIG_SITE = http://xlibs.freedesktop.org/xkbdesc XKEYBOARD_CONFIG_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 12/16 xkeyboard-config: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 13/16 xproto_evieext: bump version
In reply to Will Wagner--- package/x11r7/xproto_evieext/Config.in | 2 +- package/x11r7/xproto_evieext/xproto_evieext.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xproto_evieext/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_XPROTO_EVIEEXT bool "evieext" help - evieext 1.0.2 + evieext 1.1.0 X.Org EvIE protocol headers
package/x11r7/xproto_evieext/xproto_evieext.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XPROTO_EVIEEXT_VERSION = 1.0.2 +XPROTO_EVIEEXT_VERSION = 1.1.0 XPROTO_EVIEEXT_SOURCE = evieext-$(XPROTO_EVIEEXT_VERSION).tar.bz2 XPROTO_EVIEEXT_SITE = http://xorg.freedesktop.org/releases/individual/proto XPROTO_EVIEEXT_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 13/16 xproto_evieext: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 14/16 xlib_libXxf86misc: bump version
In reply to Will Wagner--- package/x11r7/xlib_libXxf86misc/Config.in | 2 +- .../x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xlib_libXxf86misc/Config.in +1 -1
@@ -5,5 +5,5 @@ config BR2_PACKAGE_XLIB_LIBXXF86MISC select BR2_PACKAGE_XPROTO_XF86MISCPROTO select BR2_PACKAGE_XPROTO_XPROTO help - libXxf86misc 1.0.1 + libXxf86misc 1.0.2 X.Org Xxf86misc library
package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXXF86MISC_VERSION = 1.0.1 +XLIB_LIBXXF86MISC_VERSION = 1.0.2 XLIB_LIBXXF86MISC_SOURCE = libXxf86misc-$(XLIB_LIBXXF86MISC_VERSION).tar.bz2 XLIB_LIBXXF86MISC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86MISC_AUTORECONF = NO
Signature · 1 line
1.7.0
PATCH 14/16 xlib_libXxf86misc: bump version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> Signed-off-by: Will Wagner <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 15/16 xserver_xorg-server: bump version, improve option support
In reply to Will WagnerLater version of xserver no longer need configure hack to say where mesa3d is located.
--- package/x11r7/xserver_xorg-server/Config.in | 36 ++++++++++--------- .../xserver_xorg-server/xserver_xorg-server.mk | 34 +++++++++++++----- 2 files changed, 43 insertions(+), 27 deletions(-)
package/x11r7/xserver_xorg-server/Config.in +19 -17
@@ -1,23 +1,26 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" - select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_MCOOKIE + select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO - select BR2_PACKAGE_XPROTO_DAMAGEPROTO - select BR2_PACKAGE_XPROTO_FIXESPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO + select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS + select BR2_PACKAGE_XLIB_LIBPCIACCESS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU + select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES + select BR2_PACKAGE_XLIB_LIBXFONT + select BR2_PACKAGE_XLIB_LIBXFT select BR2_PACKAGE_XLIB_LIBXI + select BR2_PACKAGE_XLIB_LIBXINERAMA + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES select BR2_PACKAGE_XLIB_LIBXXF86MISC
@@ -26,9 +29,16 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XDATA_XBITMAPS select BR2_PACKAGE_XPROTO_BIGREQSPROTO + select BR2_PACKAGE_XPROTO_COMPOSITEPROTO + select BR2_PACKAGE_XPROTO_DAMAGEPROTO + select BR2_PACKAGE_XPROTO_DRI2PROTO select BR2_PACKAGE_XPROTO_EVIEEXT + select BR2_PACKAGE_XPROTO_FIXESPROTO select BR2_PACKAGE_XPROTO_FONTSPROTO + select BR2_PACKAGE_XPROTO_GLPROTO select BR2_PACKAGE_XPROTO_INPUTPROTO + select BR2_PACKAGE_XPROTO_KBPROTO + select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_RESOURCEPROTO select BR2_PACKAGE_XPROTO_VIDEOPROTO
@@ -41,12 +51,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XF86RUSHPROTO select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_XLIB_LIBXSCRNSAVER - select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg + select BR2_PACKAGE_XUTIL_UTIL_MACROS depends on !BR2_avr32 help - xorg-server 1.7.1 + xorg-server 1.7.5 No description available comment "xorg-xserver is BROKEN on AVR32"
@@ -58,12 +66,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR help Don't display root cursor. -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - bool "Use Builtin Fonts" - depends on BR2_PACKAGE_XSERVER_XORG_SERVER - help - Enable/Use Builtin fonts. - config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX bool "Enable AIGLX Extension" depends on BR2_PACKAGE_XSERVER_XORG_SERVER
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +24 -10
@@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.7.1 +XSERVER_XORG_SERVER_VERSION = 1.7.5 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO
@@ -15,11 +15,11 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ + xlib_libpciaccess \ xlib_libXfont \ xlib_libX11 \ xlib_libXau \ xlib_libXdmcp \ - xlib_libXScrnSaver \ xlib_libXext \ xlib_libXfixes \ xlib_libXi \
@@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xproto_bigreqsproto \ xproto_compositeproto \ xproto_damageproto \ + xproto_dri2proto \ xproto_evieext \ xproto_fixesproto \ xproto_fontsproto \
@@ -69,7 +70,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d -XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg +XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx else XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg endif
@@ -86,12 +87,6 @@ else XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor endif -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y) -XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts -else -XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts -endif - ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx else
@@ -111,7 +106,6 @@ endif ifeq ($(BR2_PACKAGE_FREETYPE),y) XSERVER_XORG_SERVER_DEPENDENCIES += freetype -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype endif ifeq ($(BR2_PACKAGE_XPROTO_TRAPPROTO),y)
@@ -124,9 +118,29 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto XSERVER_XORG_SERVER_CONF_OPT += --enable-record endif +ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc +endif + +ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-composite +endif + ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2 endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver +XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver +else +XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver +endif + +ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx +endif + + $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
Signature · 1 line
1.7.0
PATCH 15/16 xserver_xorg-server: bump version, improve option support
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Hi,
Will> Later version of xserver no longer need configure hack to say where Will> mesa3d is located.
Thanks, but ..
Will> --- a/package/x11r7/xserver_xorg-server/Config.in Will> +++ b/package/x11r7/xserver_xorg-server/Config.in Will> @@ -1,23 +1,26 @@
Will> config BR2_PACKAGE_XSERVER_XORG_SERVER
Will> bool "xorg-server"
Will> - select BR2_PACKAGE_XLIB_LIBXFONT
Will> select BR2_PACKAGE_LIBDRM
Will> + select BR2_PACKAGE_MCOOKIE
Will> + select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
Will> select BR2_PACKAGE_OPENSSL
Will> - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
Will> - select BR2_PACKAGE_XPROTO_DAMAGEPROTO
Will> - select BR2_PACKAGE_XPROTO_FIXESPROTO
Will> - select BR2_PACKAGE_XPROTO_GLPROTO
Will> - select BR2_PACKAGE_XPROTO_KBPROTO
Will> - select BR2_PACKAGE_XPROTO_RANDRPROTO
Will> @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
Will> xproto_bigreqsproto \ Will> xproto_compositeproto \ Will> xproto_damageproto \ Will> + xproto_dri2proto \ Will> xproto_evieext \ Will> xproto_fixesproto \ Will> xproto_fontsproto \
Why are you removing these selects if they are still Makefile dependencies?
Will> -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
Will> - bool "Use Builtin Fonts" Will> - depends on BR2_PACKAGE_XSERVER_XORG_SERVER Will> - help
Will> - Enable/Use Builtin fonts.
Is this gone? Should we select a font or 2 then so the user doesn't end up with a broken system?
Will> ifeq ($(BR2_PACKAGE_FREETYPE),y)
Will> XSERVER_XORG_SERVER_DEPENDENCIES += freetype Will> -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype
Is this option gone? Does it still work to build without freetype?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 15/16 xserver_xorg-server: bump version, improve option support
Quoted 29 lines
Thanks, but ..
Will> --- a/package/x11r7/xserver_xorg-server/Config.in Will> +++ b/package/x11r7/xserver_xorg-server/Config.in Will> @@ -1,23 +1,26 @@ Will> config BR2_PACKAGE_XSERVER_XORG_SERVER Will> bool "xorg-server" Will> - select BR2_PACKAGE_XLIB_LIBXFONT Will> select BR2_PACKAGE_LIBDRM Will> + select BR2_PACKAGE_MCOOKIE Will> + select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg Will> select BR2_PACKAGE_OPENSSL Will> - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO Will> - select BR2_PACKAGE_XPROTO_DAMAGEPROTO Will> - select BR2_PACKAGE_XPROTO_FIXESPROTO Will> - select BR2_PACKAGE_XPROTO_GLPROTO Will> - select BR2_PACKAGE_XPROTO_KBPROTO Will> - select BR2_PACKAGE_XPROTO_RANDRPROTOWill> @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ Will> xproto_bigreqsproto \ Will> xproto_compositeproto \ Will> xproto_damageproto \ Will> + xproto_dri2proto \ Will> xproto_evieext \ Will> xproto_fixesproto \ Will> xproto_fontsproto \
Quoted 3 lines
Why are you removing these selects if they are still
Makefiledependencies?
They are still there, I reorganised the list of selects, as there are so many, so that it is alphabetical.
Quoted 9 lines
Will> -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS Will> - bool "Use Builtin Fonts" Will> - depends on BR2_PACKAGE_XSERVER_XORG_SERVER Will> - help Will> - Enable/Use Builtin fonts.Is this gone? Should we select a font or 2 then so the user doesn't end up with a broken system?
Option has gone. Will investigate what happens if you try to build with no fonts.
Quoted 7 lines
Will> ifeq ($(BR2_PACKAGE_FREETYPE),y) Will> XSERVER_XORG_SERVER_DEPENDENCIES += freetype Will> -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetypeIs this option gone? Does it still work to build without freetype?
Option has gone. Will try to see if it still works without freetype.
Will
PATCH 15/16 xserver_xorg-server: bump version, improve option support
In reply to Peter KorsgaardQuoted 35 lines · Peter Korsgaard
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"Will" == Will Wagner<[email protected]> writes:
Hi,
Will> Later version of xserver no longer need configure hack to say where Will> mesa3d is located.
Thanks, but ..
Will> --- a/package/x11r7/xserver_xorg-server/Config.in Will> +++ b/package/x11r7/xserver_xorg-server/Config.in Will> @@ -1,23 +1,26 @@ Will> config BR2_PACKAGE_XSERVER_XORG_SERVER Will> bool "xorg-server" Will> - select BR2_PACKAGE_XLIB_LIBXFONT Will> select BR2_PACKAGE_LIBDRM Will> + select BR2_PACKAGE_MCOOKIE Will> + select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg Will> select BR2_PACKAGE_OPENSSL Will> - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO Will> - select BR2_PACKAGE_XPROTO_DAMAGEPROTO Will> - select BR2_PACKAGE_XPROTO_FIXESPROTO Will> - select BR2_PACKAGE_XPROTO_GLPROTO Will> - select BR2_PACKAGE_XPROTO_KBPROTO Will> - select BR2_PACKAGE_XPROTO_RANDRPROTOWill> @@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ Will> xproto_bigreqsproto \ Will> xproto_compositeproto \ Will> xproto_damageproto \ Will> + xproto_dri2proto \ Will> xproto_evieext \ Will> xproto_fixesproto \ Will> xproto_fontsproto \
Quoted 3 lines
Why are you removing these selects if they are still
Makefiledependencies?
As I said previously, no dependencies are removed, there are just so many I have reordered them alphabetically. Also worth noting that this patch has the dependacy fix for libpciaccess that Paulis posted.
Quoted 9 lines
Will> -config BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS Will> - bool "Use Builtin Fonts" Will> - depends on BR2_PACKAGE_XSERVER_XORG_SERVER Will> - help Will> - Enable/Use Builtin fonts.Is this gone? Should we select a font or 2 then so the user doesn't end up with a broken system?
This option has gone from xserver.
The package font-misc-misc gets selected, so you will always have a font.
Quoted 8 lines
Will> ifeq ($(BR2_PACKAGE_FREETYPE),y) Will> XSERVER_XORG_SERVER_DEPENDENCIES += freetype Will> -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetypeIs this option gone? Does it still work to build without freetype?
This option has gone from xserver.
If you selected xserver then freetype is selected for you by a number of packages (xlib_libXfont, xlib_libXft, fontconfig... ) so you can not select this without freetype.
Does that answer your queries? Can this get applied?
PATCH 15/16 xserver_xorg-server: bump version, improve option support
Quoted 70 lines · Will Wagner
Quoted 38 lines · Peter Korsgaard
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Will" == Will Wagner<[email protected]> ?writes:
Hi,
?Will> ?Later version of xserver no longer need configure hack to say where
?Will> ?mesa3d is located.Thanks, but ..
?Will> ?--- a/package/x11r7/xserver_xorg-server/Config.in ?Will> ?+++ b/package/x11r7/xserver_xorg-server/Config.in ?Will> ?@@ -1,23 +1,26 @@
?Will> ? configBR2_PACKAGE_XSERVER_XORG_SERVER
?Will> ? ? ? ? bool "xorg-server"
?Will> ?- ? ? ?selectBR2_PACKAGE_XLIB_LIBXFONT
?Will> ? ? ? ? selectBR2_PACKAGE_LIBDRM
?Will> ?+ ? ? ?selectBR2_PACKAGE_MCOOKIE
?Will> ?+ ? ? ?selectBR2_PACKAGE_MESA3DifBR2_PACKAGE_XSERVER_xorg?Will> ? ? ? ? selectBR2_PACKAGE_OPENSSL
?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_COMPOSITEPROTO?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_DAMAGEPROTO?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_FIXESPROTO?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_GLPROTO
?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_KBPROTO
?Will> ?- ? ? ?selectBR2_PACKAGE_XPROTO_RANDRPROTO?Will> ?@@ -38,6 +38,7 @@
XSERVER_XORG_SERVER_DEPENDENCIES= ? \
?Will> ? ? ? ?xproto_bigreqsproto? ? ? ? ? ? \
?Will> ? ? ? ?xproto_compositeproto? ? ? ? ? \
?Will> ? ? ? ?xproto_damageproto? ? ? ? ? ? ?\
?Will> ?+ ? ? ?xproto_dri2proto ? ? ? ? ? ? ? ?\
?Will> ? ? ? ?xproto_evieext? ? ? ? ? ? ? ? ?\
?Will> ? ? ? ?xproto_fixesproto? ? ? ? ? ? ? \
?Will> ? ? ? ?xproto_fontsproto? ? ? ? ? ? ? \Quoted 3 lines
Why are you removing these selects if they are still
Makefiledependencies?As I said previously, no dependencies are removed, there are just so many I have reordered them alphabetically. Also worth noting that this patch has the dependacy fix for libpciaccess that Paulis posted.
Quoted 9 lines
?Will> ?-config
BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS?Will> ?- ? ?bool "Use Builtin Fonts"
?Will> ?- ? ?depends onBR2_PACKAGE_XSERVER_XORG_SERVER?Will> ?- ? ?help
?Will> ?- ? ? ? ?Enable/Use Builtin fonts.Is this gone? Should we select a font or 2 then so the user doesn't end up with a broken system?
This option has gone from xserver.
The package font-misc-misc gets selected, so you will always have a font.
Quoted 8 lines
?Will> ? ifeq ($(BR2_PACKAGE_FREETYPE),y)
?Will> ?XSERVER_XORG_SERVER_DEPENDENCIES+= freetype ?Will> ?-XSERVER_XORG_SERVER_CONF_OPT += --enable-freetypeIs this option gone? Does it still work to build without freetype?
Quoted 7 lines
This option has gone from xserver.
If you selected xserver then freetype is selected for you by a number of packages (
xlib_libXfont,xlib_libXft, fontconfig... ) so you can not select this without freetype.Does that answer your queries? Can this get applied?
PATCH 15/16 xserver_xorg-server: bump version, improve option support
In reply to Will WagnerQuoted 4 lines · Will Wagner
Later version of xserver no longer need configure hack to say where mesa3d is located.
Signed-off-by Will Wagner <[email protected]>
Seems that my ACK was little bit too early...
Quoted 44 lines
---
?package/x11r7/xserver_xorg-server/Config.in ? ? ? ?| ? 36 ++++++++++--------- ?.../xserver_xorg-server/xserver_xorg-server.mk ? ? | ? 34 +++++++++++++----- ?2 files changed, 43 insertions(+), 27 deletions(-)package/x11r7/xserver_xorg-server/Config.in +0
-0@@ -1,23 +1,26 @@?config
BR2_PACKAGE_XSERVER_XORG_SERVER
? ? ? ?bool "xorg-server"
- ? ? ? selectBR2_PACKAGE_XLIB_LIBXFONT
? ? ? ?selectBR2_PACKAGE_LIBDRM
+ ? ? ? selectBR2_PACKAGE_MCOOKIE
+ ? ? ? selectBR2_PACKAGE_MESA3DifBR2_PACKAGE_XSERVER_xorg
? ? ? ?selectBR2_PACKAGE_OPENSSL
- ? ? ? selectBR2_PACKAGE_XPROTO_COMPOSITEPROTO
- ? ? ? selectBR2_PACKAGE_XPROTO_DAMAGEPROTO
- ? ? ? selectBR2_PACKAGE_XPROTO_FIXESPROTO
- ? ? ? selectBR2_PACKAGE_XPROTO_GLPROTO
- ? ? ? selectBR2_PACKAGE_XPROTO_KBPROTO
- ? ? ? selectBR2_PACKAGE_XPROTO_RANDRPROTO
+ ? ? ? selectBR2_PACKAGE_PIXMAN
? ? ? ?selectBR2_PACKAGE_XFONT_FONT_ALIASif !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS ? ? ? ?selectBR2_PACKAGE_XFONT_FONT_MISC_MISCif !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS ? ? ? ?selectBR2_PACKAGE_XFONT_FONT_CURSOR_MISCif !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBPCIACCESS
? ? ? ?selectBR2_PACKAGE_XLIB_LIBX11
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXAU
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXCURSOR
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXDAMAGE
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXDMCP
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXEXT
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXFIXES
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXFONT
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXFT
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXI
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXINERAMA
+ ? ? ? selectBR2_PACKAGE_XLIB_LIBXRANDR
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXRENDER
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXRES
? ? ? ?selectBR2_PACKAGE_XLIB_LIBXXF86MISCpackage/x11r7/xserver_xorg-server/Config.in +0
-0@@ -26,9 +29,16 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
Quoted 6 lines
? ? ? ?select
BR2_PACKAGE_XLIB_XTRANS
? ? ? ?selectBR2_PACKAGE_XDATA_XBITMAPS
? ? ? ?selectBR2_PACKAGE_XPROTO_BIGREQSPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_COMPOSITEPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_DAMAGEPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_DRI2PROTO
You have added select here...
Quoted 23 lines
? ? ? ?select
BR2_PACKAGE_XPROTO_EVIEEXT
+ ? ? ? selectBR2_PACKAGE_XPROTO_FIXESPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_FONTSPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_GLPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_INPUTPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_KBPROTO
+ ? ? ? selectBR2_PACKAGE_XPROTO_RANDRPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_RENDERPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_RESOURCEPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_VIDEOPROTOpackage/x11r7/xserver_xorg-server/Config.in +0
-0@@ -41,12 +51,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER? ? ? ?select
BR2_PACKAGE_XPROTO_XF86RUSHPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
? ? ? ?selectBR2_PACKAGE_XPROTO_XPROTO
- ? ? ? selectBR2_PACKAGE_PIXMAN
- ? ? ? selectBR2_PACKAGE_XLIB_LIBXSCRNSAVER
- ? ? ? selectBR2_PACKAGE_MESA3DifBR2_PACKAGE_XSERVER_xorg
+ ? ? ? selectBR2_PACKAGE_XUTIL_UTIL_MACROS
? ? ? ?depends on !BR2_avr32
? ? ? ?help
- ? ? ? ? xorg-server 1.7.1
+ ? ? ? ? xorg-server 1.7.5
? ? ? ? ?No description available
[...]
Quoted 27 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-0@@ -4,7 +4,7 @@?# ?################################################################################
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1
-1-XSERVER_XORG_SERVER_VERSION = 1.7.1 +XSERVER_XORG_SERVER_VERSION = 1.7.5?XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 ?XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
?XSERVER_XORG_SERVER_AUTORECONF = NOpackage/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1
-1@@ -15,11 +15,11 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install ?XSERVER_XORG_SERVER_DEPENDENCIES = ? ? \ ? ? ? ?xutil_util-macros ? ? ? ? ? ? ? \ + ? ? ? xlib_libpciaccess ? ? ? ? ? ? ? \ ? ? ? ?xlib_libXfont ? ? ? ? ? ? ? ? ? \ ? ? ? ?xlib_libX11 ? ? ? ? ? ? ? ? ? ? \ ? ? ? ?xlib_libXau ? ? ? ? ? ? ? ? ? ? \ ? ? ? ?xlib_libXdmcp ? ? ? ? ? ? ? ? ? \ - ? ? ? xlib_libXScrnSaver ? ? ? ? ? ? ?\ ? ? ? ?xlib_libXext ? ? ? ? ? ? ? ? ? ?\ ? ? ? ?xlib_libXfixes ? ? ? ? ? ? ? ? ?\ ? ? ? ?xlib_libXi ? ? ? ? ? ? ? ? ? ? ?\
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk XSERVER_XORG_SERVER_DEPENDENCIES = ? ?\ · line 41
Quoted 4 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1
-0@@ -38,6 +38,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = ? ?\ ? ? ? ?xproto_bigreqsproto ? ? ? ? ? ? \ ? ? ? ?xproto_compositeproto ? ? ? ? ? \ ? ? ? ?xproto_damageproto ? ? ? ? ? ? ?\ + ? ? ? xproto_dri2proto ? ? ? ? ? ? ? ?\
And here...
Quoted 45 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-0? ? ? ?xproto_evieext ? ? ? ? ? ? ? ? ?\ ? ? ? ?xproto_fixesproto ? ? ? ? ? ? ? \ ? ? ? ?xproto_fontsproto ? ? ? ? ? ? ? \@@ -69,7 +70,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ ?ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)?XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1
-1-XSERVER_XORG_SERVER_CONF_OPT += --with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)" --enable-xorg +XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx?else
?XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
?endifpackage/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-0@@ -86,12 +87,6 @@ else?XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor ?endif
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-6-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS),y) -XSERVER_XORG_SERVER_CONF_OPT += --enable-builtin-fonts -else -XSERVER_XORG_SERVER_CONF_OPT += --disable-builtin-fonts -endif -?ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) ?XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx ?else
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-0@@ -111,7 +106,6 @@ endif ?ifeq ($(BR2_PACKAGE_FREETYPE),y)?XSERVER_XORG_SERVER_DEPENDENCIES += freetype -XSERVER_XORG_SERVER_CONF_OPT += --enable-freetype ?endif
?ifeq ($(BR2_PACKAGE_XPROTO_TRAPPROTO),y)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0
-0@@ -124,9 +118,29 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto?XSERVER_XORG_SERVER_CONF_OPT += --enable-record
?endifpackage/x11r7/xserver_xorg-server/xserver_xorg-server.mk +8
-0+ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc +endif + +ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-composite +endif +
Quoted 4 lines
?ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) ?XSERVER_XORG_SERVER_DEPENDENCIES +=
xproto_dri2proto?XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2 ?endif
But I have added this in my previous patches! And I think it is more correct, since not all drivers need it.
Quoted 13 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +12
-0+ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver +XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver +else +XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver +endif + +ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) +XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx +endif + +?$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))
PATCH 15/16 xserver_xorg-server: bump version, improve option support
Quoted 11 lines · Paulius Zaleckas
Quoted 5 lines · Will Wagner
Later version of xserver no longer need configure hack to say where mesa3d is located.
Signed-off-by Will Wagner<[email protected]>Seems that my ACK was little bit too early...
Quoted 10 lines
Quoted 6 lines
+
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)XSERVER_XORG_SERVER_DEPENDENCIES+=xproto_dri2protoXSERVER_XORG_SERVER_CONF_OPT+= --enable-dri2 endifBut I have added this in my previous patches! And I think it is more correct, since not all drivers need it.
Ok, missed that. Will fix and resubmit.
PATCH 16/16 xdriver_xf86-video-intel: bump version Signed-off-by: Will Wagner <[email protected]>
In reply to Will Wagner--- package/x11r7/xdriver_xf86-video-intel/Config.in | 5 +++-- ...ver_xf86-video-intel-2.10.0-cross-compile.patch | 11 +++++++++++ .../xdriver_xf86-video-intel.mk | 6 ++++-- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch
package/x11r7/xdriver_xf86-video-intel/Config.in +3 -2
@@ -5,7 +5,8 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_DRI2PROTO + select BR2_PACKAGE_XLIB_LIBPCIACCESS + select BR2_PACKAGE_LIBDRM help - xf86-video-intel 2.9.1 + xf86-video-intel 2.10.0 Intel video driver
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel-2.10.0-cross-compile.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- a/configure.ac.orig 2010-01-04 22:20:07.000000000 +0000 ++++ b/configure.ac 2010-02-19 12:12:50.000000000 +0000 +@@ -103,7 +103,7 @@ + CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" + CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" + AC_MSG_CHECKING([whether to include DRI support]) +-if test x$DRI != xno; then ++if test "$cross_compiling" = "no" -a test x$DRI != xno; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) + AC_CHECK_FILE([${sdkdir}/sarea.h],
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +4 -2
@@ -4,11 +4,13 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.9.1 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.10.0 XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES -XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto xproto_dri2proto +XDRIVER_XF86_VIDEO_INTEL_LIBTOOL_PATCH = NO +XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = --enable-dri +XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess XDRIVER_XF86_VIDEO_INTEL_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install $(eval $(call AUTOTARGETS,package/x11r7,xdriver_xf86-video-intel))
Signature · 1 line
1.7.0
PATCH 16/16 xdriver_xf86-video-intel: bump version Signed-off-by: Will Wagner <[email protected]>
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Will" == Will Wagner <[email protected]> writes:
Will> ---
Will> package/x11r7/xdriver_xf86-video-intel/Config.in | 5 +++--
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard