xlib_libpthread-stubs: Rename package to libpthread-stubs
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/7 xlib_libpthread-stubs: Rename package to libpthread-stubs
---
v4: rebased v3
v3: rebased v2
libdrm: rename to libpthread-stubs as well for bisectability
v2: http://patchwork.ozlabs.org/patch/304117/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278296/ (Spenser Gilliland)
Config.in.legacy | 15 ++++++++++++---
package/Config.in | 1 +
package/libdrm/Config.in | 2 +-
package/libdrm/libdrm.mk | 2 +-
.../Config.in | 2 +-
package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++
package/x11r7/Config.in | 1 -
package/x11r7/libxcb/Config.in | 2 +-
package/x11r7/libxcb/libxcb.mk | 2 +-
.../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 --------------------
10 files changed, 38 insertions(+), 29 deletions(-)
rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (88%)
create mode 100644 package/libpthread-stubs/libpthread-stubs.mk
delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mkConfig.in.legacy +12 -3
@@ -464,11 +464,20 @@ config BR2_PACKAGE_XSERVER_tinyx config BR2_PACKAGE_PTHREAD_STUBS bool "pthread-stubs option has been renamed" select BR2_LEGACY - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBPTHREAD_STUBS help For consistency reason, the pthread-stubs package has been - renamed to xlib_libpthread-stubs. + renamed to libpthread-stubs. + +config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + bool "xlib-libpthread-stubs option has been renamed" + depends on BR2_PACKAGE_XORG7 + select BR2_LEGACY + select BR2_PACKAGE_LIBPTHREAD_STUBS + help + The pthread stubs do not depend on X11 nor Xlib. Thus the + package has been renamed + BR2_PACKAGE_LIBPTHREAD_STUBS ############################################################################### comment "Legacy options removed in 2012.08"
package/Config.in +1 -0
@@ -744,6 +744,7 @@ source "package/liblog4c-localtime/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" source "package/libplist/Config.in" +source "package/libpthread-stubs/Config.in" source "package/libpthsem/Config.in" source "package/libseccomp/Config.in" source "package/libsigc/Config.in"
package/libdrm/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help
package/libdrm/libdrm.mk +1 -1
@@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT LIBDRM_INSTALL_STAGING = YES LIBDRM_DEPENDENCIES = \ - xlib_libpthread-stubs \ + libpthread-stubs \ host-pkgconf LIBDRM_CONF_OPT = \
package/libpthread-stubs/Config.in renamed from package/x11r7/xlib_libpthread-stubs/Config.in +1 -1
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS +config BR2_PACKAGE_LIBPTHREAD_STUBS bool "libpthread-stubs" depends on BR2_TOOLCHAIN_HAS_THREADS help
package/libpthread-stubs/libpthread-stubs.mk new file +20 -0
@@ -0,0 +1,20 @@ +################################################################################ +# +# libpthread-stubs +# +################################################################################ + +LIBPTHREAD_STUBS_VERSION = 0.3 +LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2 +LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ +LIBPTHREAD_STUBS_LICENSE = MIT +LIBPTHREAD_STUBS_LICENSE_FILES = COPYING + +LIBPTHREAD_STUBS_INSTALL_STAGING = YES + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
package/x11r7/Config.in +0 -1
@@ -53,7 +53,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libxkbfile/Config.in source package/x11r7/xlib_xtrans/Config.in source package/x11r7/xlib_libpciaccess/Config.in - source package/x11r7/xlib_libpthread-stubs/Config.in endmenu menu "X11R7 Applications" source package/x11r7/xapp_appres/Config.in
package/x11r7/libxcb/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBXCB bool "libxcb" - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS + select BR2_PACKAGE_LIBPTHREAD_STUBS select BR2_PACKAGE_XCB_PROTO select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXAU
package/x11r7/libxcb/libxcb.mk +1 -1
@@ -13,7 +13,7 @@ LIBXCB_LICENSE_FILES = COPYING LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ - host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ + host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ host-xcb-proto host-python host-pkgconf LIBXCB_CONF_OPT = --disable-build-docs
package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk deleted +0 -20
@@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libpthread-stubs -# -################################################################################ - -XLIB_LIBPTHREAD_STUBS_VERSION = 0.3 -XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2 -XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/ -XLIB_LIBPTHREAD_STUBS_LICENSE = MIT -XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING - -XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES - -ifeq ($(BR2_PREFER_STATIC_LIB),y) -XLIB_LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package))
Signature · 1 line
1.7.9.5
PATCH v2 1/7 xlib_libpthread-stubs: Rename package to libpthread-stubs
Hi Bernd,
Sorry I didn't review this earlier - but keep up the good work!
Quoted 28 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>---
v4: rebased v3
v3: rebased v2
libdrm: rename to libpthread-stubs as well for bisectability
v2: http://patchwork.ozlabs.org/patch/304117/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278296/ (Spenser Gilliland)Config.in.legacy | 15 ++++++++++++--- package/Config.in | 1 + package/libdrm/Config.in | 2 +- package/libdrm/libdrm.mk | 2 +- .../Config.in | 2 +- package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/libxcb/Config.in | 2 +- package/x11r7/libxcb/libxcb.mk | 2 +- .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 -------------------- 10 files changed, 38 insertions(+), 29 deletions(-) rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (88%) create mode 100644 package/libpthread-stubs/libpthread-stubs.mk delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mkConfig.in.legacy +0
-0
Config.in.legacy config BR2_PACKAGE_XSERVER_tinyx · line 470
Quoted 10 lines
Config.in.legacy +2
-3@@ -464,11 +464,20 @@ config BR2_PACKAGE_XSERVER_tinyx config BR2_PACKAGE_PTHREAD_STUBS bool "pthread-stubs option has been renamed" select BR2_LEGACY - select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBPTHREAD_STUBS help For consistency reason, the pthread-stubs package has been - renamed to xlib_libpthread-stubs. + renamed to libpthread-stubs.
Wow, so we rename this thing twice in just over a year... How good are
we! :-)
Config.in.legacy config BR2_PACKAGE_XSERVER_tinyx · line 472
Quoted 2 lines
Config.in.legacy +2
-0+ +config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
This should go in the 2014.02 section, otherwise it may be removed again
way too early.
Otherwise looks good to me, so perhaps Peter can fix this up while
committing.
Regards,
Arnout
Quoted 11 lines
Config.in.legacy +8
-0+ bool "xlib-libpthread-stubs option has been renamed" + depends on BR2_PACKAGE_XORG7 + select BR2_LEGACY + select BR2_PACKAGE_LIBPTHREAD_STUBS + help + The pthread stubs do not depend on X11 nor Xlib. Thus the + package has been renamed + BR2_PACKAGE_LIBPTHREAD_STUBS ############################################################################### comment "Legacy options removed in 2012.08"
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 2/7 libdrm: Remove dependency towards X11
In reply to a message not in the archive---
v4: rebased v3
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)
package/libdrm/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
package/libdrm/Config.in +4 -2
@@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" select BR2_PACKAGE_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help Direct Rendering Manager
@@ -14,6 +13,7 @@ menu "DRM Drivers" config BR2_PACKAGE_LIBDRM_INTEL bool "intel" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64
@@ -22,6 +22,7 @@ config BR2_PACKAGE_LIBDRM_INTEL config BR2_PACKAGE_LIBDRM_RADEON bool "radeon" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64
@@ -30,6 +31,7 @@ config BR2_PACKAGE_LIBDRM_RADEON config BR2_PACKAGE_LIBDRM_NOUVEAU bool "nouveau" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help
@@ -37,6 +39,7 @@ config BR2_PACKAGE_LIBDRM_NOUVEAU config BR2_PACKAGE_LIBDRM_VMWGFX bool "vmwgfx" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help
@@ -65,5 +68,4 @@ endmenu endif comment "libdrm needs a toolchain w/ largefile" - depends on BR2_PACKAGE_XORG7 depends on !BR2_LARGEFILE
Signature · 1 line
1.7.9.5
PATCH v2 2/7 libdrm: Remove dependency towards X11
Quoted 6 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>---
v4: rebased v3
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)
Oh, something I forgot to mention in the previous patch as well: you
should keep the Signed-off-by of the two previous authors, so they get their due credit (which is required since they published their patches under GPL).
Otherwise looks good to me, but one more remark below.
Quoted 41 lines
package/libdrm/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)package/libdrm/Config.in +3
-1@@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBDRM bool "libdrm" select BR2_PACKAGE_LIBPTHREAD_STUBS - depends on BR2_PACKAGE_XORG7 depends on BR2_LARGEFILE help Direct Rendering Manager@@ -14,6 +13,7 @@ menu "DRM Drivers" config BR2_PACKAGE_LIBDRM_INTEL bool "intel" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64@@ -22,6 +22,7 @@ config BR2_PACKAGE_LIBDRM_INTEL config BR2_PACKAGE_LIBDRM_RADEON bool "radeon" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBATOMIC_OPS select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64@@ -30,6 +31,7 @@ config BR2_PACKAGE_LIBDRM_RADEON config BR2_PACKAGE_LIBDRM_NOUVEAU bool "nouveau" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help
package/libdrm/Config.in config BR2_PACKAGE_LIBDRM_NOUVEAU · line 45
Quoted 7 lines
package/libdrm/Config.in +1
-0@@ -37,6 +39,7 @@ config BR2_PACKAGE_LIBDRM_NOUVEAU config BR2_PACKAGE_LIBDRM_VMWGFX bool "vmwgfx" + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBPCIACCESS depends on BR2_i386 || BR2_x86_64 help
So only the three experimental ARM drivers work without Xorg?
Not for this patch, but does libdrm do anything useful when no driver is
selected? Shouldn't it have a dependency on x86 || arm so that at least one driver can be selected?
Regards,
Arnout
Quoted 7 lines
package/libdrm/Config.in +0
-1@@ -65,5 +68,4 @@ endmenu endif comment "libdrm needs a toolchain w/ largefile" - depends on BR2_PACKAGE_XORG7 depends on !BR2_LARGEFILE
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 2/7 libdrm: Remove dependency towards X11
Hi,
Arnout Vandecappelle <[email protected]> wrote in
news:52F1E0A6.2060409 at mind.be:
Quoted 1 line
So only the three experimental ARM drivers work without Xorg?
taking a closer look at the required dependencies it seems Xorg is only needed for the Intel driver
libdrm 2.4.52 will be compiled with:
libkms yes Intel API no vmwgfx API yes Radeon API yes Nouveau API yes OMAP API yes EXYNOS API yes Freedreno API yes
When enabling the Intel API at least xlib_libpciaccess is needed:
checking for PCIACCESS... no
configure: error: Package requirements (pciaccess >= 0.10) were not met:
This is inline with what the LFS team writes:
http://www.linuxfromscratch.org/blfs/view/svn/x/libdrm.html
Quoted 2 lines
Not for this patch, but does libdrm do anything useful when no driver is selected?
Honestly I do not know, but technically configure does not complain:
libdrm 2.4.52 will be compiled with:
libkms no Intel API no vmwgfx API no Radeon API no Nouveau API no OMAP API no EXYNOS API no Freedreno API no
I will repost the patch containing fewer dependencies.
Regards, Bernd
PATCH v2 2/7 libdrm: Remove dependency towards X11
In reply to Arnout VandecappelleArnout Vandecappelle <[email protected]> wrote in
news:52F1E0A6.2060409 at mind.be:
Quoted 7 lines · Bernd Kuhls
Quoted 6 lines
Signed-off-by: Bernd Kuhls
<[email protected]> ---
v4: rebased v3
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)
Hi,
Arnout Vandecappelle <[email protected]> wrote in
news:52F1E733.3030005 at mind.be:
Quoted 6 lines
This removes the following implicit dependencies (from XORG7):
depends onBR2_USE_WCHAR
depends onBR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_PREFER_STATIC_LIB # dlopen inxlib_libX11
Are you sure they are no longer needed? Actually, the same is true for
the libdrm patch that removes the XORG7 dependency.
I tested a locally revised libdrm patch; using this defconfig
BR2_x86_pentium_mmx=y
BR2_ENABLE_DEBUG=y
BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_BINUTILS_VERSION_2_23_2=y
BR2_GCC_VERSION_4_8_X=y
BR2_PACKAGE_LIBDRM=y
BR2_PACKAGE_LIBDRM_RADEON=y
BR2_PACKAGE_LIBDRM_NOUVEAU=y
BR2_PACKAGE_LIBDRM_VMWGFX=y
and compiled libdrm (w/o Intel API) even without BR2_PACKAGE_LIBATOMIC_OPS and without BR2_PACKAGE_XLIB_LIBPCIACCESS, so USE_WCHAR, TOOLCHAIN_HAS_THREADS and !BR2_PREFER_STATIC_LIB do not seem to be necessary for libdrm at all.
Regards, Bernd
PATCH v2 2/7 libdrm: Remove dependency towards X11
Quoted 37 lines · Bernd Kuhls
Arnout Vandecappelle <[email protected]> wrote in
news:52F1E0A6.2060409 at mind.be:Quoted 7 lines · Bernd Kuhls
Quoted 6 lines
Signed-off-by: Bernd Kuhls
<[email protected]> ---
v4: rebased v3
v3: rebased v2
v2: http://patchwork.ozlabs.org/patch/304116/ (Paul Cercueil)
v1: http://patchwork.ozlabs.org/patch/278297/ (Spenser Gilliland)Hi,
Arnout Vandecappelle <[email protected]> wrote in
news:52F1E733.3030005 at mind.be:Quoted 6 lines
This removes the following implicit dependencies (from XORG7):
depends onBR2_USE_WCHAR
depends onBR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_PREFER_STATIC_LIB # dlopen inxlib_libX11
Are you sure they are no longer needed? Actually, the same is true for
the libdrm patch that removes the XORG7 dependency.I tested a locally revised libdrm patch; using this defconfig
BR2_x86_pentium_mmx=y
BR2_ENABLE_DEBUG=y
BR2_OPTIMIZE_2=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
#BR2_UCLIBC_INSTALL_UTILSis not set
BR2_BINUTILS_VERSION_2_23_2=y
BR2_GCC_VERSION_4_8_X=y
BR2_PACKAGE_LIBDRM=y
BR2_PACKAGE_LIBDRM_RADEON=y
BR2_PACKAGE_LIBDRM_NOUVEAU=y
BR2_PACKAGE_LIBDRM_VMWGFX=y
Quoted 4 lines
and compiled libdrm (w/o Intel API) even without
BR2_PACKAGE_LIBATOMIC_OPSand withoutBR2_PACKAGE_XLIB_LIBPCIACCESS, soUSE_WCHAR,TOOLCHAIN_HAS_THREADSand !BR2_PREFER_STATIC_LIB do not seem to be necessary for libdrm at all.
Great, thanks!
Regards,
Arnout
Quoted 9 lines
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 3/7 libdrm: bump to version 2.4.52
In reply to a message not in the archive---
v2: bump to version 2.4.52
package/libdrm/libdrm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libdrm/libdrm.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.46 +LIBDRM_VERSION = 2.4.52 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SITE = http://dri.freedesktop.org/libdrm/ LIBDRM_LICENSE = MIT
Signature · 1 line
1.7.9.5
PATCH v2 4/7 mesa3d: pull out from x11
In reply to a message not in the archive---
v2: rebased v1
v1: rebased Spenser Gilliland?s patch:
http://patchwork.ozlabs.org/patch/278302/
package/Config.in | 1 +
package/{x11r7 => }/mesa3d/Config.in | 0
.../{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch | 0
package/{x11r7 => }/mesa3d/mesa3d.mk | 0
package/x11r7/Config.in | 1 -
5 files changed, 1 insertion(+), 1 deletion(-)
rename package/{x11r7 => }/mesa3d/Config.in (100%)
rename package/{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch (100%)
rename package/{x11r7 => }/mesa3d/mesa3d.mk (100%)package/Config.in +1 -0
@@ -314,6 +314,7 @@ source "package/lvm2/Config.in" source "package/mdadm/Config.in" source "package/media-ctl/Config.in" source "package/memtester/Config.in" +source "package/mesa3d/Config.in" source "package/minicom/Config.in" source "package/nanocom/Config.in" source "package/neard/Config.in"
package/mesa3d/Config.in renamed from package/x11r7/mesa3d/Config.in +0 -0
package/mesa3d/mesa3d-uclibc-locale.patch renamed from package/x11r7/mesa3d/mesa3d-uclibc-locale.patch +0 -0
package/mesa3d/mesa3d.mk renamed from package/x11r7/mesa3d/mesa3d.mk +0 -0
package/x11r7/Config.in +0 -1
@@ -15,7 +15,6 @@ if BR2_PACKAGE_XORG7 endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in - source package/x11r7/mesa3d/Config.in source package/x11r7/xcb-util/Config.in source package/x11r7/xcb-util-image/Config.in source package/x11r7/xcb-util-keysyms/Config.in
Signature · 1 line
1.7.9.5
PATCH v2 4/7 mesa3d: pull out from x11
Quoted 5 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>---
v2: rebased v1
v1: rebased Spenser Gilliland?s patch:http://patchwork.ozlabs.org/patch/278302/
Again, retain the original SoB.
Quoted 16 lines
package/Config.in | 1 + package/{x11r7 => }/mesa3d/Config.in | 0 .../{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch | 0 package/{x11r7 => }/mesa3d/mesa3d.mk | 0 package/x11r7/Config.in | 1 - 5 files changed, 1 insertion(+), 1 deletion(-) rename package/{x11r7 => }/mesa3d/Config.in (100%) rename package/{x11r7 => }/mesa3d/mesa3d-uclibc-locale.patch (100%) rename package/{x11r7 => }/mesa3d/mesa3d.mk (100%)package/Config.in +0
-0
package/Config.in source "package/lvm2/Config.in" · line 317
Quoted 4 lines
package/Config.in +1
-0@@ -314,6 +314,7 @@ source "package/lvm2/Config.in" source "package/mdadm/Config.in" source "package/media-ctl/Config.in" source "package/memtester/Config.in" +source "package/mesa3d/Config.in"
Maybe this was commented on before, but: Hardware handling? Doesn't it
fit better in either Graphic libraries or Libraries/Graphic?
Regards,
Arnout
Quoted 28 lines
package/Config.in +0
-0source "package/minicom/Config.in" source "package/nanocom/Config.in" source "package/neard/Config.in"package/mesa3d/Config.in renamed from package/x11r7/mesa3d/Config.in +0
-0package/mesa3d/mesa3d-uclibc-locale.patch renamed from package/x11r7/mesa3d/mesa3d-uclibc-locale.patch +0
-0package/mesa3d/mesa3d.mk renamed from package/x11r7/mesa3d/mesa3d.mk +0
-0package/x11r7/Config.in +0
-1@@ -15,7 +15,6 @@ if BR2_PACKAGE_XORG7 endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in - source package/x11r7/mesa3d/Config.in source package/x11r7/xcb-util/Config.in source package/x11r7/xcb-util-image/Config.in source package/x11r7/xcb-util-keysyms/Config.in
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
In reply to a message not in the archive---
v2: bump to version 10.0.3
v1: - rebased Spenser Gilliland?s patch, which originally bumped
version to 9.1.6 and removed mesa3d-uclibc-locale.patch:
http://patchwork.ozlabs.org/patch/278303/
- removed MESA3D_AUTORECONF=yes, not needed anymore
- fixed bug in variable naming BR2_PACKAGE_MESA3D_DRI_DRIVERS_* -> BR2_PACKAGE_MESA3D_DRI_DRIVER_* preventing DRI drivers from being built
- bump version to 10.0.2
package/mesa3d/Config.in | 180 +++++++++++++++++++- package/mesa3d/mesa3d-uclibc-locale.patch | 56 ------ package/mesa3d/mesa3d.mk | 120 ++++++++++--- package/opengl/Config.in | 1 + package/opengl/libegl/libegl.mk | 4 + package/opengl/libgl/Config.in | 6 + package/opengl/libgl/libgl.mk | 21 +++ package/opengl/libgles/libgles.mk | 4 + package/opengl/libopenvg/libopenvg.mk | 4 + .../xserver_xorg-server/xserver_xorg-server.mk | 4 +- 10 files changed, 317 insertions(+), 83 deletions(-) delete mode 100644 package/mesa3d/mesa3d-uclibc-locale.patch create mode 100644 package/opengl/libgl/Config.in create mode 100644 package/opengl/libgl/libgl.mk
package/mesa3d/Config.in +174 -6
@@ -1,14 +1,182 @@ config BR2_PACKAGE_MESA3D bool "Mesa 3D Graphics Library" - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_DRI2PROTO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT select BR2_PACKAGE_HOST_LIBXML2_PYTHON - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR + select BR2_PACKAGE_XPROTO_DRI2_PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_LARGEFILE help Mesa 3D, an open-source implementation of the OpenGL specification. + + http://mesa3d.org + +if BR2_PACKAGE_MESA3D + +menu "libraries" + +config BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_UDEV + bool "gbm support" + help + Add support for Graphics Buffer Manager. + +config BR2_PACKAGE_MESA3D_XVMC + bool "xvmc support" + help + Add support for X Video Motion Compensation. + +config BR2_PACKAGE_MESA3D_VDPAU + bool "vdpau support" + help + Add support for Video Decode and Presentation API for Unix. + +endmenu + +menu "Drivers" + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Supports intel chips with Gallium. In most cases, the DRI i965 driver + should be used as it is better maintained by Intel. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + bool "Gallium nouveau driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_NOUVEAU + help + Supports all Nvidia GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 + bool "Gallium r300 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the R300, R400, and R500 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + bool "Gallium r600 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the R600, R700, and R800 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + bool "Gallium radeonsi driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the Radeon HD7000/HD8000/HD9000 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA + bool "Gallium vmware svga driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_VMWGFX + help + This is a virtual GPU driver for VMWare virtual machines. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + bool "Gallium swrast driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + This is a software opengl implementation using the Gallium3D + infrastructure. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + bool "DRI swrast driver" + select BR2_PACKAGE_MESA3D_DRI_DRIVER + help + This is a software opengl implementation using the DRI infrastructure. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + bool "DRI i965 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Supports all Intel GPUs. This version is most supported by Intel. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON + bool "DRI radeon driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Legacy Radeon driver for R100 series GPUs. + +endmenu + +# The following hidden options inform gallium or dri driver selection. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRIVER + bool + +menu "API Support" +depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || BR2_PACKAGE_MESA3D_DRI_DRIVER + +config BR2_PACKAGE_MESA3D_OPENGL + bool "OpenGL" + select BR2_PACKAGE_HAS_OPENGL + help + Use the Khronos OpenGL API. This is a desktop computer API and is not + normally implemented by embedded systems. + +config BR2_PACKAGE_MESA3D_EGL + bool "EGL" + select BR2_PACKAGE_MESA3D_GBM + select BR2_PACKAGE_HAS_OPENGL_EGL + help + Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications + similar to GLX, for X, and WGL, for Windows. + + config BR2_PACKAGE_MESA3D_OPENGL_ES + bool "OpenGL ES" + select BR2_PACKAGE_HAS_OPENGL_ES + help + Use the Khronos OpenGL ES APIs. This is commonly used on embedded + systems and represents a subset of the OpenGL API. + +config BR2_PACKAGE_MESA3D_OPENVG + bool "OpenVG" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Use the Khronos OpenVG APIs. This is a 2D API commonly used on + embedded systems. + +config BR2_PACKAGE_MESA3D_OPENCL + bool "OpenCL" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENCL + help + Use the Khronos OpenCL APIs. This is a GPU computation language + commonly used in GPGPU computing applications. + +endmenu + +endif + +comment "mesa3d depends on a toolchain with C++ and largefile support" + depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP
package/mesa3d/mesa3d-uclibc-locale.patch deleted +0 -56
56 lines not on this page · raw message
package/mesa3d/mesa3d.mk +101 -19
136 lines not on this page · raw message
package/opengl/Config.in +1 -0
@@ -1,4 +1,5 @@ source "package/opengl/libegl/Config.in" +source "package/opengl/libgl/Config.in" source "package/opengl/libgles/Config.in" source "package/opengl/libopenvg/Config.in" source "package/opengl/libopenmax/Config.in"
package/opengl/libegl/libegl.mk +4 -0
@@ -7,6 +7,10 @@ LIBEGL_SOURCE = LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL)) +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +LIBEGL_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBEGL_DEPENDENCIES),) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error."
package/opengl/libgl/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HAS_OPENGL_GL + bool + +config BR2_PACKAGE_PROVIDES_OPENGL_GL + depends on BR2_PACKAGE_HAS_OPENGL_GL + string
package/opengl/libgl/libgl.mk new file +21 -0
@@ -0,0 +1,21 @@ +################################################################################ +# +# libgl +# +################################################################################ + +LIBGL_SOURCE = +LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_GL)) + +ifeq ($(BR2_PACKAGE_MESA_OPENGL),y) +LIBGL_DEPENDENCIES += mesa3d +endif + +ifeq ($(LIBGL_DEPENDENCIES),) +define LIBGL_CONFIGURE_CMDS + echo "No libGL implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))
package/opengl/libgles/libgles.mk +4 -0
@@ -7,6 +7,10 @@ LIBGLES_SOURCE = LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +LIBGLES_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBGLES_DEPENDENCIES),) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error."
package/opengl/libopenvg/libopenvg.mk +4 -0
@@ -7,6 +7,10 @@ LIBOPENVG_SOURCE = LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +LIBOPENVG_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBOPENVG_DEPENDENCIES),) define LIBOPENVG_CONFIGURE_CMDS echo "No libOpenVG implementation selected. Configuration error."
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -2
@@ -99,7 +99,7 @@ else # modular XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto else XSERVER_XORG_SERVER_CONF_OPT += --disable-dri
@@ -172,7 +172,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-glx else XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
Signature · 1 line
1.7.9.5
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
Quoted 1 line · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
The commit message should explain why the uclibc-locale patch and
AUTORECONF can be removed. It should also explain a bit better what "modularize" means. And also explicitly warn that mesa3d no longer depends on X and therefore must explicitly include the largefile dependency. And maybe I'm forgetting something.
And of course: keep Spenser's SoB.
Quoted 32 lines
---
v2: bump to version 10.0.3
v1: - rebased Spenser Gilliland?s patch, which originally bumped
version to 9.1.6 and removed mesa3d-uclibc-locale.patch:
http://patchwork.ozlabs.org/patch/278303/
- removed MESA3D_AUTORECONF=yes, not needed anymore
- fixed bug in variable naming BR2_PACKAGE_MESA3D_DRI_DRIVERS_* -> BR2_PACKAGE_MESA3D_DRI_DRIVER_* preventing DRI drivers from being built
- bump version to 10.0.2package/mesa3d/Config.in | 180 +++++++++++++++++++- package/mesa3d/mesa3d-uclibc-locale.patch | 56 ------ package/mesa3d/mesa3d.mk | 120 ++++++++++--- package/opengl/Config.in | 1 + package/opengl/libegl/libegl.mk | 4 + package/opengl/libgl/Config.in | 6 + package/opengl/libgl/libgl.mk | 21 +++ package/opengl/libgles/libgles.mk | 4 + package/opengl/libopenvg/libopenvg.mk | 4 + .../xserver_xorg-server/xserver_xorg-server.mk | 4 +- 10 files changed, 317 insertions(+), 83 deletions(-) delete mode 100644 package/mesa3d/mesa3d-uclibc-locale.patch create mode 100644 package/opengl/libgl/Config.in create mode 100644 package/opengl/libgl/libgl.mkpackage/mesa3d/Config.in +0
-0@@ -1,14 +1,182 @@ config BR2_PACKAGE_MESA3D
package/mesa3d/Config.in line 11
Quoted 10 lines
package/mesa3d/Config.in +0
-6bool "Mesa 3D Graphics Library" - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_DRI2PROTO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT select BR2_PACKAGE_HOST_LIBXML2_PYTHON - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
This removes the following implicit dependencies (from XORG7):
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_PREFER_STATIC_LIB # dlopen in xlib_libX11
Are you sure they are no longer needed? Actually, the same is true for
the libdrm patch that removes the XORG7 dependency.
Quoted 29 lines
package/mesa3d/Config.in +26
-0+ select BR2_PACKAGE_XPROTO_DRI2_PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_LARGEFILE help Mesa 3D, an open-source implementation of the OpenGL specification. + + http://mesa3d.org + +if BR2_PACKAGE_MESA3D + +menu "libraries" + +config BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_UDEV + bool "gbm support" + help + Add support for Graphics Buffer Manager. + +config BR2_PACKAGE_MESA3D_XVMC + bool "xvmc support" + help + Add support for X Video Motion Compensation. +
package/mesa3d/Config.in line 44
Quoted 10 lines
package/mesa3d/Config.in +10
-0+config BR2_PACKAGE_MESA3D_VDPAU + bool "vdpau support" + help + Add support for Video Decode and Presentation API for Unix. + +endmenu + +menu "Drivers" + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
I think it would be better named BR2_PACKAGE_MESA3D_DRIVER_GALLIUM_I915
so that all drivers start with the same substring. On second thought:
since the configure option has it like this, it is better to keep it similar to the configure option.
package/mesa3d/Config.in line 52
Quoted 8 lines
package/mesa3d/Config.in +8
-0+ bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Supports intel chips with Gallium. In most cases, the DRI i965 driver + should be used as it is better maintained by Intel. +
[snip a bunch of drivers]
package/mesa3d/Config.in line 123
Quoted 4 lines
package/mesa3d/Config.in +4
-0+ +endmenu + +# The following hidden options inform gallium or dri driver selection.
I think it would be a bit clearer if these hidden options were defined
before the Drivers menu. Also, the ocmment should be "inform the .mk file of gallium or dri driver selection".
package/mesa3d/Config.in line 136
Quoted 13 lines
package/mesa3d/Config.in +13
-0+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRIVER + bool + +menu "API Support" +depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || BR2_PACKAGE_MESA3D_DRI_DRIVER
Isn't it simpler to write "depends on BR2_PACKAGE_MESA3D_DRIVER" ?
Quoted 35 lines
package/mesa3d/Config.in +35
-0+ +config BR2_PACKAGE_MESA3D_OPENGL + bool "OpenGL" + select BR2_PACKAGE_HAS_OPENGL + help + Use the Khronos OpenGL API. This is a desktop computer API and is not + normally implemented by embedded systems. + +config BR2_PACKAGE_MESA3D_EGL + bool "EGL" + select BR2_PACKAGE_MESA3D_GBM + select BR2_PACKAGE_HAS_OPENGL_EGL + help + Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications + similar to GLX, for X, and WGL, for Windows. + + config BR2_PACKAGE_MESA3D_OPENGL_ES + bool "OpenGL ES" + select BR2_PACKAGE_HAS_OPENGL_ES + help + Use the Khronos OpenGL ES APIs. This is commonly used on embedded + systems and represents a subset of the OpenGL API. + +config BR2_PACKAGE_MESA3D_OPENVG + bool "OpenVG" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Use the Khronos OpenVG APIs. This is a 2D API commonly used on + embedded systems. + +config BR2_PACKAGE_MESA3D_OPENCL + bool "OpenCL" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
package/mesa3d/Config.in line 181
Quoted 10 lines
package/mesa3d/Config.in +10
-0+ select BR2_PACKAGE_HAS_OPENCL + help + Use the Khronos OpenCL APIs. This is a GPU computation language + commonly used in GPGPU computing applications. + +endmenu + +endif + +comment "mesa3d depends on a toolchain with C++ and largefile support"
"mesa3d needs a toolchain w/ C++, largefile"
Quoted 3 lines
package/mesa3d/Config.in +1
-0+ depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPPpackage/mesa3d/mesa3d-uclibc-locale.patch deleted +0
-0
[snip]
Quoted 40 lines
package/mesa3d/mesa3d.mk +3
-19@@ -4,31 +4,15 @@ # ################################################################################ -MESA3D_VERSION = 7.10.3 -MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz -MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION) +MESA3D_VERSION = 10.0.3 +MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 +MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.html -MESA3D_AUTORECONF = YES MESA3D_INSTALL_STAGING = YES -MESA3D_CONF_OPT = \ - --disable-egl \ - --disable-glu \ - --disable-glw \ - --disable-glut \ - --disable-gallium \ - --with-driver=dri \ - --with-dri-drivers=swrast \ - --disable-static - MESA3D_DEPENDENCIES = \ - xproto_glproto \ - xlib_libXxf86vm \ - xlib_libXdamage \ - xlib_libXfixes \ - xproto_dri2proto \ libdrm \ expat \ host-xutil_makedepend \
package/mesa3d/mesa3d.mk MESA3D_DEPENDENCIES = \ · line 25
Quoted 5 lines
package/mesa3d/mesa3d.mk +2
-0@@ -37,4 +21,102 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex +MESA3D_CONF_OPT = \ + --disable-static
If this is really needed, then it should depend on !PREFER_STATIC and
the comment should be extended.
Quoted 2 lines
package/mesa3d/mesa3d.mk +2
-0+ +# Libraries
[snip]
package/opengl/Config.in line 2
Quoted 7 lines
package/opengl/Config.in +1
-0@@ -1,4 +1,5 @@ source "package/opengl/libegl/Config.in" +source "package/opengl/libgl/Config.in"
The addition of libgl should be a separate patch.
Quoted 8 lines
package/opengl/Config.in +0
-0source "package/opengl/libgles/Config.in" source "package/opengl/libopenvg/Config.in" source "package/opengl/libopenmax/Config.in"package/opengl/libegl/libegl.mk +0
-0
package/opengl/libegl/libegl.mk line 12
Quoted 6 lines
package/opengl/libegl/libegl.mk +3
-0@@ -7,6 +7,10 @@ LIBEGL_SOURCE = LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL)) +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +LIBEGL_DEPENDENCIES += mesa3d +endif
We changed the way that this works. Instead, the mesa3d Config.in should
define BR2_PACKAGE_PROVIDES_OPENGL_EGL. Cfr. rpi-userland.
(I didn't look at the rest any more for lack of time).
Regards,
Arnout
Quoted 96 lines
package/opengl/libegl/libegl.mk +1
-0+ ifeq ($(LIBEGL_DEPENDENCIES),) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error."package/opengl/libgl/Config.in new file +6
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HAS_OPENGL_GL + bool + +config BR2_PACKAGE_PROVIDES_OPENGL_GL + depends on BR2_PACKAGE_HAS_OPENGL_GL + stringpackage/opengl/libgl/libgl.mk new file +21
-0@@ -0,0 +1,21 @@ +################################################################################ +# +# libgl +# +################################################################################ + +LIBGL_SOURCE = +LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_GL)) + +ifeq ($(BR2_PACKAGE_MESA_OPENGL),y) +LIBGL_DEPENDENCIES += mesa3d +endif + +ifeq ($(LIBGL_DEPENDENCIES),) +define LIBGL_CONFIGURE_CMDS + echo "No libGL implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))package/opengl/libgles/libgles.mk +4
-0@@ -7,6 +7,10 @@ LIBGLES_SOURCE = LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +LIBGLES_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBGLES_DEPENDENCIES),) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error."package/opengl/libopenvg/libopenvg.mk +4
-0@@ -7,6 +7,10 @@ LIBOPENVG_SOURCE = LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +LIBOPENVG_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBOPENVG_DEPENDENCIES),) define LIBOPENVG_CONFIGURE_CMDS echo "No libOpenVG implementation selected. Configuration error."package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2
-2@@ -99,7 +99,7 @@ else # modular XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto else XSERVER_XORG_SERVER_CONF_OPT += --disable-dri@@ -172,7 +172,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-glx else XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
In reply to Bernd KuhlsHi bernd,
Are you still working on that patch ?
Regards,
Sebastien.
Quoted 541 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>---
v2: bump to version 10.0.3
v1: - rebased Spenser Gilliland?s patch, which originally bumped
version to 9.1.6 and removed mesa3d-uclibc-locale.patch:
http://patchwork.ozlabs.org/patch/278303/
- removed MESA3D_AUTORECONF=yes, not needed anymore
- fixed bug in variable naming BR2_PACKAGE_MESA3D_DRI_DRIVERS_* -> BR2_PACKAGE_MESA3D_DRI_DRIVER_* preventing DRI drivers from being built
- bump version to 10.0.2package/mesa3d/Config.in | 180 +++++++++++++++++++- package/mesa3d/mesa3d-uclibc-locale.patch | 56 ------ package/mesa3d/mesa3d.mk | 120 ++++++++++--- package/opengl/Config.in | 1 + package/opengl/libegl/libegl.mk | 4 + package/opengl/libgl/Config.in | 6 + package/opengl/libgl/libgl.mk | 21 +++ package/opengl/libgles/libgles.mk | 4 + package/opengl/libopenvg/libopenvg.mk | 4 + .../xserver_xorg-server/xserver_xorg-server.mk | 4 +- 10 files changed, 317 insertions(+), 83 deletions(-) delete mode 100644 package/mesa3d/mesa3d-uclibc-locale.patch create mode 100644 package/opengl/libgl/Config.in create mode 100644 package/opengl/libgl/libgl.mkpackage/mesa3d/Config.in +174
-6@@ -1,14 +1,182 @@ config BR2_PACKAGE_MESA3D bool "Mesa 3D Graphics Library" - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_DRI2PROTO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT select BR2_PACKAGE_HOST_LIBXML2_PYTHON - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR + select BR2_PACKAGE_XPROTO_DRI2_PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_LARGEFILE help Mesa 3D, an open-source implementation of the OpenGL specification. + + http://mesa3d.org + +if BR2_PACKAGE_MESA3D + +menu "libraries" + +config BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_UDEV + bool "gbm support" + help + Add support for Graphics Buffer Manager. + +config BR2_PACKAGE_MESA3D_XVMC + bool "xvmc support" + help + Add support for X Video Motion Compensation. + +config BR2_PACKAGE_MESA3D_VDPAU + bool "vdpau support" + help + Add support for Video Decode and Presentation API for Unix. + +endmenu + +menu "Drivers" + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 + bool "Gallium i915 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Supports intel chips with Gallium. In most cases, the DRI i965 driver + should be used as it is better maintained by Intel. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU + bool "Gallium nouveau driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_NOUVEAU + help + Supports all Nvidia GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300 + bool "Gallium r300 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the R300, R400, and R500 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + bool "Gallium r600 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the R600, R700, and R800 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + bool "Gallium radeonsi driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Supports the Radeon HD7000/HD8000/HD9000 series of ATI/AMD GPUs. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA + bool "Gallium vmware svga driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_LIBDRM_VMWGFX + help + This is a virtual GPU driver for VMWare virtual machines. + +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST + bool "Gallium swrast driver" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + help + This is a software opengl implementation using the Gallium3D + infrastructure. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + bool "DRI swrast driver" + select BR2_PACKAGE_MESA3D_DRI_DRIVER + help + This is a software opengl implementation using the DRI infrastructure. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + bool "DRI i965 driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_LIBDRM_INTEL + help + Supports all Intel GPUs. This version is most supported by Intel. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON + bool "DRI radeon driver" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_LIBDRM_RADEON + help + Legacy Radeon driver for R100 series GPUs. + +endmenu + +# The following hidden options inform gallium or dri driver selection. +config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRI_DRIVER + select BR2_PACKAGE_MESA3D_DRIVER + bool + +config BR2_PACKAGE_MESA3D_DRIVER + bool + +menu "API Support" +depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || BR2_PACKAGE_MESA3D_DRI_DRIVER + +config BR2_PACKAGE_MESA3D_OPENGL + bool "OpenGL" + select BR2_PACKAGE_HAS_OPENGL + help + Use the Khronos OpenGL API. This is a desktop computer API and is not + normally implemented by embedded systems. + +config BR2_PACKAGE_MESA3D_EGL + bool "EGL" + select BR2_PACKAGE_MESA3D_GBM + select BR2_PACKAGE_HAS_OPENGL_EGL + help + Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications + similar to GLX, for X, and WGL, for Windows. + + config BR2_PACKAGE_MESA3D_OPENGL_ES + bool "OpenGL ES" + select BR2_PACKAGE_HAS_OPENGL_ES + help + Use the Khronos OpenGL ES APIs. This is commonly used on embedded + systems and represents a subset of the OpenGL API. + +config BR2_PACKAGE_MESA3D_OPENVG + bool "OpenVG" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_MESA3D_OPENGL_EGL + help + Use the Khronos OpenVG APIs. This is a 2D API commonly used on + embedded systems. + +config BR2_PACKAGE_MESA3D_OPENCL + bool "OpenCL" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_HAS_OPENCL + help + Use the Khronos OpenCL APIs. This is a GPU computation language + commonly used in GPGPU computing applications. + +endmenu + +endif + +comment "mesa3d depends on a toolchain with C++ and largefile support" + depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPPpackage/mesa3d/mesa3d-uclibc-locale.patch deleted +0
-56@@ -1,56 +0,0 @@ -[PATCH] Fix compilation on uClibc without locale support - -Based on similar patch from OE: - -http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/mesa/mesa/0001-Compile-with-uclibc.patch?id=e4039eb74b20e96d4b8837cd58cf2d13d091e1ad - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure.ac | 3 +++ - src/glsl/strtod.c | 2 +- - src/mesa/main/imports.c | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fbaa376..454dad2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -450,6 +450,9 @@ AC_SUBST([DLOPEN_LIBS]) - dnl See if posix_memalign is available - AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) - -+dnl See if newlocale is available -+AC_CHECK_FUNCS_ONCE(newlocale) -+ - dnl SELinux awareness. - AC_ARG_ENABLE([selinux], - [AS_HELP_STRING([--enable-selinux], -diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c -index a876e13..9fce7e9 100644 ---- a/src/glsl/strtod.c -+++ b/src/glsl/strtod.c -@@ -44,7 +44,7 @@ double - double - glsl_strtod(const char *s, char **end) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) -+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); -diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c -index d3727ef..363bf32 100644 ---- a/src/mesa/main/imports.c -+++ b/src/mesa/main/imports.c -@@ -757,7 +757,7 @@ float - float - _mesa_strtof( const char *s, char **end ) - { --#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) -+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined(HAVE_NEWLOCALE) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); --- -1.7.10.4 -package/mesa3d/mesa3d.mk +101
-19@@ -4,31 +4,15 @@ # ################################################################################ -MESA3D_VERSION = 7.10.3 -MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz -MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION) +MESA3D_VERSION = 10.0.3 +MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 +MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.html -MESA3D_AUTORECONF = YES MESA3D_INSTALL_STAGING = YES -MESA3D_CONF_OPT = \ - --disable-egl \ - --disable-glu \ - --disable-glw \ - --disable-glut \ - --disable-gallium \ - --with-driver=dri \ - --with-dri-drivers=swrast \ - --disable-static - MESA3D_DEPENDENCIES = \ - xproto_glproto \ - xlib_libXxf86vm \ - xlib_libXdamage \ - xlib_libXfixes \ - xproto_dri2proto \ libdrm \ expat \ host-xutil_makedepend \@@ -37,4 +21,102 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex +MESA3D_CONF_OPT = \ + --disable-static + +# Libraries + +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +MESA3D_DEPENDENCIES += udev +MESA3D_CONF_OPT += --enable-gbm +else +MESA3D_CONF_OPT += --disable-gbm +endif + +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +MESA3D_DEPENDENCIES += \ + xproto_xf86driproto xproto_dri2proto xproto_glproto \ + xlib_libX11 xlib_libXext xlib_libXdamage xlib_libXfixes libxcb +MESA3D_CONF_OPT += \ + --enable-dri \ + --enable-xa \ + --enable-glx +else +MESA3D_CONF_OPT += \ + --disable-dri \ + --disable-xa \ + --disable-glx +endif + +# Drivers + +#Gallium Drivers +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915) += i915 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300) += r300 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast +# DRI Drivers +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon + +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),y) +MESA3D_CONF_OPT += \ + --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) +else +MESA3D_CONF_OPT += --without-gallium-drivers +endif + +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +MESA3D_CONF_OPT += \ + --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) +else +MESA3D_CONF_OPT += --without-dri-drivers +endif + +# APIs + +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +MESA3D_EGL_PLATFORMS = drm +ifeq ($(BR2_PACKAGE_WAYLAND),y) +MESA3D_DEPENDENCIES += wayland +MESA3D_EGL_PLATFORMS += wayland +endif +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +MESA3D_EGL_PLATFORMS += x11 +endif +MESA3D_CONF_OPT += \ + --enable-egl \ + --with-egl-platforms=$(foreach subst $(space),$(comma),$(MESA3D_EGL_PLATFORMS)) +else +MESA3D_CONF_OPT += --disable-egl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL),y) +MESA3D_CONF_OPT += --enable-opengl +else +MESA3D_CONF_OPT += --disable-opengl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +MESA3D_CONF_OPT += --enable-gles1 --enable-gles2 +else +MESA3D_CONF_OPT += --disable-gles1 --disable-gles2 +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +MESA3D_CONF_OPT += --enable-openvg --enable-gallium-egl +else +MESA3D_CONF_OPT += --disable-openvg --disable-gallium-egl +endif + +ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) +MESA3D_CONF_OPT += --enable-opencl +else +MESA3D_CONF_OPT += --disable-opencl +endif + $(eval $(autotools-package))package/opengl/Config.in +1
-0@@ -1,4 +1,5 @@ source "package/opengl/libegl/Config.in" +source "package/opengl/libgl/Config.in" source "package/opengl/libgles/Config.in" source "package/opengl/libopenvg/Config.in" source "package/opengl/libopenmax/Config.in"package/opengl/libegl/libegl.mk +4
-0@@ -7,6 +7,10 @@ LIBEGL_SOURCE = LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL)) +ifeq ($(BR2_PACKAGE_MESA3D_EGL),y) +LIBEGL_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBEGL_DEPENDENCIES),) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error."package/opengl/libgl/Config.in new file +6
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_HAS_OPENGL_GL + bool + +config BR2_PACKAGE_PROVIDES_OPENGL_GL + depends on BR2_PACKAGE_HAS_OPENGL_GL + stringpackage/opengl/libgl/libgl.mk new file +21
-0@@ -0,0 +1,21 @@ +################################################################################ +# +# libgl +# +################################################################################ + +LIBGL_SOURCE = +LIBGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_GL)) + +ifeq ($(BR2_PACKAGE_MESA_OPENGL),y) +LIBGL_DEPENDENCIES += mesa3d +endif + +ifeq ($(LIBGL_DEPENDENCIES),) +define LIBGL_CONFIGURE_CMDS + echo "No libGL implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))package/opengl/libgles/libgles.mk +4
-0@@ -7,6 +7,10 @@ LIBGLES_SOURCE = LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) +LIBGLES_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBGLES_DEPENDENCIES),) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error."package/opengl/libopenvg/libopenvg.mk +4
-0@@ -7,6 +7,10 @@ LIBOPENVG_SOURCE = LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG)) +ifeq ($(BR2_PACKAGE_MESA3D_OPENVG),y) +LIBOPENVG_DEPENDENCIES += mesa3d +endif + ifeq ($(LIBOPENVG_DEPENDENCIES),) define LIBOPENVG_CONFIGURE_CMDS echo "No libOpenVG implementation selected. Configuration error."package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2
-2@@ -99,7 +99,7 @@ else # modular XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto else XSERVER_XORG_SERVER_CONF_OPT += --disable-dri@@ -172,7 +172,7 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif -ifeq ($(BR2_PACKAGE_MESA3D),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-glx else XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
Sebastien Bourdelin <[email protected]> wrote in news:5318B183.60005 at savoirfairelinux.com:
Quoted 4 lines
Hi bernd,
Are you still working on that patch ?
Regards,
Sebastien.
Hi,
yes, just yesterday ;)
Regards, Bernd
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
Great, thanks
Regards,
Sebastien.
Quoted 18 lines · Bernd Kuhls
Sebastien Bourdelin <[email protected]> wrote in news:5318B183.60005 at savoirfairelinux.com:
Quoted 4 lines
Hi bernd,
Are you still working on that patch ?
Regards,
Sebastien.Hi,
yes, just yesterday ;)
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 4 lines · Bernd Kuhls
Sebastien Bourdelin <[email protected]> wrote in news:5318B183.60005 at savoirfairelinux.com:
Quoted 8 lines
Quoted 4 lines
Hi bernd,
Are you still working on that patch ?
Regards,
Sebastien.Hi,
yes, just yesterday ;)
So you will resubmit a new version?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
Thomas Petazzoni
<[email protected]> wrote
in news:20140306224559.080a6fb3 at skate:
Quoted 1 line
So you will resubmit a new version?
Hi,
yes, but I need several days for testing the several combinations of Config.in-options. During yesterdays testing some questions came up:
Is it correct that buildroot lacks llvm support?
If true, I have to remove some radeon-related options Spenser added:
http://www.linuxfromscratch.org/blfs/view/svn/x/mesalib.html
Also I could not find libclc/OpenCL as buildroot package:
http://cgit.freedesktop.org/mesa/mesa/commit/?
id=a64d3dd1358fe0f69ebbf10da35c9ebd672e6f9d
The current mesa3d.mk in buildroot only builds the swrast driver, my personal need is to extend the package to compile the i965 drm driver so I will concentrate on this. It does not need the dependencies I mentioned above.
Regards, Bernd
PATCH v2 5/7 mesa3d: modularize and bump to version 10.0.3
Dear Bernd Kuhls,
Quoted 4 lines · Bernd Kuhls
yes, but I need several days for testing the several combinations of Config.in-options. During yesterdays testing some questions came up:
Is it correct that buildroot lacks llvm support?
Indeed, we don't have LLVM support.
Quoted 2 lines
If true, I have to remove some radeon-related options Spenser added:
http://www.linuxfromscratch.org/blfs/view/svn/x/mesalib.html
Probably yes, I am clearly not very knowledgeable about Mesa dependencies.
Quoted 3 lines
Also I could not find libclc/OpenCL as buildroot package:
http://cgit.freedesktop.org/mesa/mesa/commit/?
id=a64d3dd1358fe0f69ebbf10da35c9ebd672e6f9d
This is only when --enable-opencl is used, no?
Quoted 3 lines
The current mesa3d.mk in buildroot only builds the swrast driver, my personal need is to extend the package to compile the i965 drm driver so I will concentrate on this. It does not need the dependencies I mentioned above.
Yes, that's fine. As long as we make progress by bumping mesa, allow to build it outside of X11, there is no need to support each and every possible combinations from the beginning. The package can be progressively improved.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 6/7 xorg: Bump xserver_xorg-server version to 1.15.0
In reply to a message not in the archive- remove patches applied upstream
- add new dependency xproto_presentproto
---
v2: rebased v1
package/x11r7/xserver_xorg-server/Config.in | 1 + .../xserver_xorg-server-02-cve-2013-1940.patch | 34 ----------- ...ut-allocate-enough-space-for-null-charact.patch | 59 -------------------- .../xserver_xorg-server/xserver_xorg-server.mk | 3 +- 4 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch delete mode 100644 package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch
package/x11r7/xserver_xorg-server/Config.in +1 -0
@@ -36,6 +36,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_GLPROTO select BR2_PACKAGE_XPROTO_INPUTPROTO select BR2_PACKAGE_XPROTO_KBPROTO + select BR2_PACKAGE_XPROTO_PRESENTPROTO select BR2_PACKAGE_XPROTO_RANDRPROTO select BR2_PACKAGE_XPROTO_RENDERPROTO select BR2_PACKAGE_XPROTO_RESOURCEPROTO
package/x11r7/xserver_xorg-server/xserver_xorg-server-02-cve-2013-1940.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f Mon Sep 17 00:00:00 2001 -From: Dave Airlie <[email protected]> -Date: Wed, 10 Apr 2013 06:09:01 +0000 -Subject: xf86: fix flush input to work with Linux evdev devices. - -So when we VT switch back and attempt to flush the input devices, -we don't succeed because evdev won't return part of an event, -since we were only asking for 4 bytes, we'd only get -EINVAL back. - -This could later cause events to be flushed that we shouldn't have -gotten. - -This is a fix for CVE-2013-1940. - -Signed-off-by: Dave Airlie <[email protected]> -Reviewed-by: Peter Hutterer <[email protected]> -Signed-off-by: Peter Hutterer <[email protected]> ---- -diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c -index ab3757a..4d08c1e 100644 ---- a/hw/xfree86/os-support/shared/posix_tty.c -+++ b/hw/xfree86/os-support/shared/posix_tty.c -@@ -421,7 +421,8 @@ xf86FlushInput(int fd) - { - fd_set fds; - struct timeval timeout; -- char c[4]; -+ /* this needs to be big enough to flush an evdev event. */ -+ char c[256]; - - DebugF("FlushingSerial\n"); - if (tcflush(fd, TCIFLUSH) == 0) --- -cgit v0.9.0.2-2-gbebe
package/x11r7/xserver_xorg-server/xserver_xorg-server-03-Revert-kinput-allocate-enough-space-for-null-charact.patch deleted +0 -59
59 lines not on this page · raw message
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +2 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.12.4 +XSERVER_XORG_SERVER_VERSION = 1.15.0 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_LICENSE = MIT
@@ -40,6 +40,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xproto_glproto \ xproto_inputproto \ xproto_kbproto \ + xproto_presentproto \ xproto_randrproto \ xproto_renderproto \ xproto_resourceproto \
Signature · 1 line
1.7.9.5
PATCH v2 6/7 xorg: Bump xserver_xorg-server version to 1.15.0
Quoted 4 lines · Bernd Kuhls
- remove patches applied upstream
- add new dependencyxproto_presentprotoSigned-off-by Bernd Kuhls <[email protected]>
Regards,
Arnout
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v2 7/7 xdriver_xf86-video-intel: Bump version to 2.99.909
In reply to a message not in the archive--- .../xdriver_xf86-video-intel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907 +XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.909 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_LICENSE = MIT
Signature · 1 line
1.7.9.5