* [meta-oe][PATCH 0/2] add new recipe for xf86-video-mga and ssiapi @ 2017-05-23 7:01 jackie.huang 2017-05-23 7:01 ` [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe jackie.huang 2017-05-23 7:01 ` [meta-oe][PATCH 2/2] ssiapi: " jackie.huang 0 siblings, 2 replies; 11+ messages in thread From: jackie.huang @ 2017-05-23 7:01 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> -- The following changes since commit fc03b3d9382dd5b6a8fff5f84e4c86a1acc9a73a: drbd-utils: fix dependency for perl under small-fs (2017-05-09 12:29:15 -0400) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git jhuang0/r_upstream-xf86-video-mga-ssiapi_170523_0 http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/r_upstream-xf86-video-mga-ssiapi_170523_0 Jackie Huang (2): xf86-video-mga: add new recipe ssiapi: add new recipe .../xorg-driver/xf86-video-mga/checkfile.patch | 68 ++++++++++++++++++++++ .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb | 25 ++++++++ 3 files changed, 114 insertions(+) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb -- 2.11.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-23 7:01 [meta-oe][PATCH 0/2] add new recipe for xf86-video-mga and ssiapi jackie.huang @ 2017-05-23 7:01 ` jackie.huang 2017-05-23 14:54 ` Khem Raj 2017-07-27 22:49 ` Saul Wold 2017-05-23 7:01 ` [meta-oe][PATCH 2/2] ssiapi: " jackie.huang 1 sibling, 2 replies; 11+ messages in thread From: jackie.huang @ 2017-05-23 7:01 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> mga is an Xorg driver for Matrox video cards Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- .../xorg-driver/xf86-video-mga/checkfile.patch | 68 ++++++++++++++++++++++ .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ 2 files changed, 89 insertions(+) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch new file mode 100644 index 000000000..ceae6dfba --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch @@ -0,0 +1,68 @@ +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 29 Nov 2012 11:00:43 +0000 +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI + +Automatically enabling or disabling a feature based on installed files isn't +deterministic, and AC_CHECK_FILE returns an error when cross-compiling. + +Fix this by enabling DRI by default, and removing the explicit file checks as +pkg-config is good enough. + +(#57606) + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + configure.ac | 25 ++----------------------- + 1 file changed, 2 insertions(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fca1a9c..d2aa2ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, + [moduledir="$libdir/xorg/modules"]) + + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], +- [Disable DRI support [[default=auto]]]), ++ [Disable DRI support [[default=enabled]]]), + [DRI="$enableval"], +- [DRI=auto]) ++ [DRI=yes]) + AC_ARG_ENABLE(exa, + AS_HELP_STRING([--disable-exa], + [Disable EXA support [[default=enabled]]]), +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` + + # Checks for libraries. + +-if 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], +- [have_sarea_h="yes"], [have_sarea_h="no"]) +- AC_CHECK_FILE([${sdkdir}/dristruct.h], +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) +-fi +- +-AC_MSG_CHECKING([whether to include DRI support]) +-if test "x$DRI" = xauto; then +- if test "x$have_dri_h" = xyes && \ +- test "x$have_sarea_h" = xyes && \ +- test "x$have_dristruct_h" = xyes; then +- DRI="yes" +- else +- DRI="no" +- fi +-fi +-AC_MSG_RESULT([$DRI]) +- + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) + if test "x$DRI" = xyes; then + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) +-- +1.7.10.4 + diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb new file mode 100644 index 000000000..cd680597c --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb @@ -0,0 +1,21 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +SUMMARY = "X.Org X server -- Matrox MGA display driver" + +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" + +SRC_URI += "file://checkfile.patch" + +DEPENDS += "virtual/libx11 libpciaccess" + +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' + +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" +SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" + +RDEPENDS_${PN} = "xserver-xorg-module-exa" -- 2.11.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-23 7:01 ` [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe jackie.huang @ 2017-05-23 14:54 ` Khem Raj 2017-05-23 19:36 ` Jussi Kukkonen 2017-07-27 22:49 ` Saul Wold 1 sibling, 1 reply; 11+ messages in thread From: Khem Raj @ 2017-05-23 14:54 UTC (permalink / raw) To: jhuang0; +Cc: openembeded-devel On Tue, May 23, 2017 at 12:01 AM, <jackie.huang@windriver.com> wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > mga is an Xorg driver for Matrox video cards > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 ++++++++++++++++++++++ > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > 2 files changed, 89 insertions(+) > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > new file mode 100644 > index 000000000..ceae6dfba > --- /dev/null > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > @@ -0,0 +1,68 @@ > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] > +Signed-off-by: Ross Burton <ross.burton@intel.com> > + > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 > +From: Ross Burton <ross.burton@intel.com> > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > + > +Automatically enabling or disabling a feature based on installed files isn't > +deterministic, and AC_CHECK_FILE returns an error when cross-compiling. > + > +Fix this by enabling DRI by default, and removing the explicit file checks as > +pkg-config is good enough. > + > +(#57606) > + > +Signed-off-by: Ross Burton <ross.burton@intel.com> > +--- > + configure.ac | 25 ++----------------------- > + 1 file changed, 2 insertions(+), 23 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index fca1a9c..d2aa2ed 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > + [moduledir="$libdir/xorg/modules"]) > + > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > +- [Disable DRI support [[default=auto]]]), > ++ [Disable DRI support [[default=enabled]]]), > + [DRI="$enableval"], > +- [DRI=auto]) > ++ [DRI=yes]) > + AC_ARG_ENABLE(exa, > + AS_HELP_STRING([--disable-exa], > + [Disable EXA support [[default=enabled]]]), > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` > + > + # Checks for libraries. > + > +-if 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], > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) > +-fi > +- > +-AC_MSG_CHECKING([whether to include DRI support]) > +-if test "x$DRI" = xauto; then > +- if test "x$have_dri_h" = xyes && \ > +- test "x$have_sarea_h" = xyes && \ > +- test "x$have_dristruct_h" = xyes; then > +- DRI="yes" > +- else > +- DRI="no" > +- fi > +-fi > +-AC_MSG_RESULT([$DRI]) > +- > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > + if test "x$DRI" = xyes; then > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > +-- > +1.7.10.4 > + > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > new file mode 100644 > index 000000000..cd680597c > --- /dev/null > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > @@ -0,0 +1,21 @@ > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > + > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > + > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > + > +LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > + > +SRC_URI += "file://checkfile.patch" > + > +DEPENDS += "virtual/libx11 libpciaccess" > + > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' can this also include musl ? if yes then use linux* and I think it could be a good thing to check for x11 as required distro features may be > + > +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" > +SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" > + > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" > +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" > + > +RDEPENDS_${PN} = "xserver-xorg-module-exa" > -- > 2.11.0 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-23 14:54 ` Khem Raj @ 2017-05-23 19:36 ` Jussi Kukkonen 2017-05-24 2:11 ` Huang, Jie (Jackie) 0 siblings, 1 reply; 11+ messages in thread From: Jussi Kukkonen @ 2017-05-23 19:36 UTC (permalink / raw) To: Khem Raj; +Cc: openembeded-devel On 23 May 2017 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > On Tue, May 23, 2017 at 12:01 AM, <jackie.huang@windriver.com> wrote: > > From: Jackie Huang <jackie.huang@windriver.com> > > > > mga is an Xorg driver for Matrox video cards > > > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > > --- > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 > ++++++++++++++++++++++ > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > > 2 files changed, 89 insertions(+) > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/ > checkfile.patch > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_1.6.5.bb > > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > new file mode 100644 > > index 000000000..ceae6dfba > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/ > checkfile.patch > > @@ -0,0 +1,68 @@ > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/ > show_bug.cgi?id=57606] > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > + > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 > > +From: Ross Burton <ross.burton@intel.com> > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > > + > > +Automatically enabling or disabling a feature based on installed files > isn't > > +deterministic, and AC_CHECK_FILE returns an error when cross-compiling. > > + > > +Fix this by enabling DRI by default, and removing the explicit file > checks as > > +pkg-config is good enough. > > + > > +(#57606) > > + > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > +--- > > + configure.ac | 25 ++----------------------- > > + 1 file changed, 2 insertions(+), 23 deletions(-) > > + > > +diff --git a/configure.ac b/configure.ac > > +index fca1a9c..d2aa2ed 100644 > > +--- a/configure.ac > > ++++ b/configure.ac > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > > + [moduledir="$libdir/xorg/modules"]) > > + > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > > +- [Disable DRI support > [[default=auto]]]), > > ++ [Disable DRI support > [[default=enabled]]]), > > + [DRI="$enableval"], > > +- [DRI=auto]) > > ++ [DRI=yes]) > > + AC_ARG_ENABLE(exa, > > + AS_HELP_STRING([--disable-exa], > > + [Disable EXA support > [[default=enabled]]]), > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` > > + > > + # Checks for libraries. > > + > > +-if 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], > > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > > +- [have_dristruct_h="yes"], > [have_dristruct_h="no"]) > > +-fi > > +- > > +-AC_MSG_CHECKING([whether to include DRI support]) > > +-if test "x$DRI" = xauto; then > > +- if test "x$have_dri_h" = xyes && \ > > +- test "x$have_sarea_h" = xyes && \ > > +- test "x$have_dristruct_h" = xyes; then > > +- DRI="yes" > > +- else > > +- DRI="no" > > +- fi > > +-fi > > +-AC_MSG_RESULT([$DRI]) > > +- > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > > + if test "x$DRI" = xyes; then > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > > +-- > > +1.7.10.4 > > + > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1. > 6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > new file mode 100644 > > index 000000000..cd680597c > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > @@ -0,0 +1,21 @@ > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > > + > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > > + > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > > + > > +LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3 > fc" > > + > > +SRC_URI += "file://checkfile.patch" > > + > > +DEPENDS += "virtual/libx11 libpciaccess" > > + > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > can this also include musl ? if yes then use linux* > and I think it could be a good thing to check for x11 as required > distro features may be > > xorg-driver-common.inc (via xorg-driver-video.inc) should already take care of requiring "x11" distro feature. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-23 19:36 ` Jussi Kukkonen @ 2017-05-24 2:11 ` Huang, Jie (Jackie) 2017-05-24 2:46 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Huang, Jie (Jackie) @ 2017-05-24 2:11 UTC (permalink / raw) To: KUKKONEN, JUSSI, Khem Raj; +Cc: openembeded-devel > > > From: Jussi Kukkonen [mailto:jussi.kukkonen@intel.com] > Sent: Wednesday, May 24, 2017 03:37 > To: Khem Raj > Cc: Huang, Jie (Jackie); openembeded-devel > Subject: Re: [oe] [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe > > On 23 May 2017 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > On Tue, May 23, 2017 at 12:01 AM, <jackie.huang@windriver.com> wrote: > > From: Jackie Huang <jackie.huang@windriver.com> > > > > mga is an Xorg driver for Matrox video cards > > > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > > --- > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 ++++++++++++++++++++++ > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > > 2 files changed, 89 insertions(+) > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > new file mode 100644 > > index 000000000..ceae6dfba > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > @@ -0,0 +1,68 @@ > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > + > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 > > +From: Ross Burton <ross.burton@intel.com> > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > > + > > +Automatically enabling or disabling a feature based on installed files isn't > > +deterministic, and AC_CHECK_FILE returns an error when cross-compiling. > > + > > +Fix this by enabling DRI by default, and removing the explicit file checks as > > +pkg-config is good enough. > > + > > +(#57606) > > + > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > +--- > > + configure.ac | 25 ++----------------------- > > + 1 file changed, 2 insertions(+), 23 deletions(-) > > + > > +diff --git a/configure.ac b/configure.ac > > +index fca1a9c..d2aa2ed 100644 > > +--- a/configure.ac > > ++++ b/configure.ac > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > > + [moduledir="$libdir/xorg/modules"]) > > + > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > > +- [Disable DRI support [[default=auto]]]), > > ++ [Disable DRI support [[default=enabled]]]), > > + [DRI="$enableval"], > > +- [DRI=auto]) > > ++ [DRI=yes]) > > + AC_ARG_ENABLE(exa, > > + AS_HELP_STRING([--disable-exa], > > + [Disable EXA support [[default=enabled]]]), > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` > > + > > + # Checks for libraries. > > + > > +-if 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], > > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > > +- [have_dristruct_h="yes"], [have_dristruct_h="no"]) > > +-fi > > +- > > +-AC_MSG_CHECKING([whether to include DRI support]) > > +-if test "x$DRI" = xauto; then > > +- if test "x$have_dri_h" = xyes && \ > > +- test "x$have_sarea_h" = xyes && \ > > +- test "x$have_dristruct_h" = xyes; then > > +- DRI="yes" > > +- else > > +- DRI="no" > > +- fi > > +-fi > > +-AC_MSG_RESULT([$DRI]) > > +- > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > > + if test "x$DRI" = xyes; then > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > > +-- > > +1.7.10.4 > > + > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > new file mode 100644 > > index 000000000..cd680597c > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > @@ -0,0 +1,21 @@ > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > > + > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > > + > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > > + > > +LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > > + > > +SRC_URI += "file://checkfile.patch" > > + > > +DEPENDS += "virtual/libx11 libpciaccess" > > + > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > can this also include musl ? if yes then use linux* Yes, it includes musl but I don't think linux* is necessary, the linux-musl can be matched already with the above pattern and xf86-video-mga builds fine with: COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' HOST_SYS="i586-poky-linux-musl" And I see that other xorg-drivers are the same: In oe-core: $ grep -r COMPATIBLE_HOST * xf86-input-vmmouse_13.1.0.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' xf86-video-intel_git.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' xf86-video-vesa_2.3.4.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' xf86-video-vmware_13.2.1.bb:COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' In meta-oe: $ grep -r COMPATIBLE_HOST * xf86-video-ati_7.8.0.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' xf86-video-geode_2.11.16.bb:COMPATIBLE_HOST = "i.86.*-linux" xf86-video-nouveau_1.0.12.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > and I think it could be a good thing to check for x11 as required > distro features may be > > > xorg-driver-common.inc (via xorg-driver-video.inc) should already take care of requiring "x11" distro feature. Yes, that's correct: $ grep REQUIRED_DISTRO_FEATURES xorg-driver-common.inc REQUIRED_DISTRO_FEATURES = "x11" Thanks, Jackie > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-24 2:11 ` Huang, Jie (Jackie) @ 2017-05-24 2:46 ` Khem Raj 0 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2017-05-24 2:46 UTC (permalink / raw) To: Huang, Jie (Jackie), KUKKONEN, JUSSI; +Cc: openembeded-devel On Tue, May 23, 2017 at 7:11 PM Huang, Jie (Jackie) < Jackie.Huang@windriver.com> wrote: > > > > > > From: Jussi Kukkonen [mailto:jussi.kukkonen@intel.com] > > Sent: Wednesday, May 24, 2017 03:37 > > To: Khem Raj > > Cc: Huang, Jie (Jackie); openembeded-devel > > Subject: Re: [oe] [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe > > > > On 23 May 2017 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > > On Tue, May 23, 2017 at 12:01 AM, <jackie.huang@windriver.com> wrote: > > > From: Jackie Huang <jackie.huang@windriver.com> > > > > > > mga is an Xorg driver for Matrox video cards > > > > > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > > > --- > > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 > ++++++++++++++++++++++ > > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > > > 2 files changed, 89 insertions(+) > > > create mode 100644 > meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_1.6.5.bb > > > > > > diff --git > a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > > new file mode 100644 > > > index 000000000..ceae6dfba > > > --- /dev/null > > > +++ > b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > > @@ -0,0 +1,68 @@ > > > +Upstream-Status: Submitted [ > https://bugs.freedesktop.org/show_bug.cgi?id=57606] > > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > > + > > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 > > > +From: Ross Burton <ross.burton@intel.com> > > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > > > + > > > +Automatically enabling or disabling a feature based on installed > files isn't > > > +deterministic, and AC_CHECK_FILE returns an error when > cross-compiling. > > > + > > > +Fix this by enabling DRI by default, and removing the explicit file > checks as > > > +pkg-config is good enough. > > > + > > > +(#57606) > > > + > > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > > +--- > > > + configure.ac | 25 ++----------------------- > > > + 1 file changed, 2 insertions(+), 23 deletions(-) > > > + > > > +diff --git a/configure.ac b/configure.ac > > > +index fca1a9c..d2aa2ed 100644 > > > +--- a/configure.ac > > > ++++ b/configure.ac > > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > > > + [moduledir="$libdir/xorg/modules"]) > > > + > > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > > > +- [Disable DRI support > [[default=auto]]]), > > > ++ [Disable DRI support > [[default=enabled]]]), > > > + [DRI="$enableval"], > > > +- [DRI=auto]) > > > ++ [DRI=yes]) > > > + AC_ARG_ENABLE(exa, > > > + AS_HELP_STRING([--disable-exa], > > > + [Disable EXA support > [[default=enabled]]]), > > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` > > > + > > > + # Checks for libraries. > > > + > > > +-if 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], > > > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > > > +- [have_dristruct_h="yes"], > [have_dristruct_h="no"]) > > > +-fi > > > +- > > > +-AC_MSG_CHECKING([whether to include DRI support]) > > > +-if test "x$DRI" = xauto; then > > > +- if test "x$have_dri_h" = xyes && \ > > > +- test "x$have_sarea_h" = xyes && \ > > > +- test "x$have_dristruct_h" = xyes; then > > > +- DRI="yes" > > > +- else > > > +- DRI="no" > > > +- fi > > > +-fi > > > +-AC_MSG_RESULT([$DRI]) > > > +- > > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > > > + if test "x$DRI" = xyes; then > > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > > > +-- > > > +1.7.10.4 > > > + > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_1.6.5.bb > > > new file mode 100644 > > > index 000000000..cd680597c > > > --- /dev/null > > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > > @@ -0,0 +1,21 @@ > > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > > > + > > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > > > + > > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > > > + > > > +LIC_FILES_CHKSUM = > "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > > > + > > > +SRC_URI += "file://checkfile.patch" > > > + > > > +DEPENDS += "virtual/libx11 libpciaccess" > > > + > > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > can this also include musl ? if yes then use linux* > > Yes, it includes musl but I don't think linux* is necessary, the > linux-musl can be matched already with the above pattern > and xf86-video-mga builds fine with: > > COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > HOST_SYS="i586-poky-linux-musl" > > And I see that other xorg-drivers are the same: > Ok thanks > > In oe-core: > $ grep -r COMPATIBLE_HOST * > xf86-input-vmmouse_13.1.0.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > xf86-video-intel_git.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > xf86-video-vesa_2.3.4.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > xf86-video-vmware_13.2.1.bb:COMPATIBLE_HOST = > '(i.86.*-linux|x86_64.*-linux)' > > In meta-oe: > $ grep -r COMPATIBLE_HOST * > xf86-video-ati_7.8.0.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > xf86-video-geode_2.11.16.bb:COMPATIBLE_HOST = "i.86.*-linux" > xf86-video-nouveau_1.0.12.bb:COMPATIBLE_HOST = '(i.86|x86_64).*-linux' > > > and I think it could be a good thing to check for x11 as required > > distro features may be > > > > > > xorg-driver-common.inc (via xorg-driver-video.inc) should already take > care of requiring "x11" distro feature. > > Yes, that's correct: > $ grep REQUIRED_DISTRO_FEATURES xorg-driver-common.inc > REQUIRED_DISTRO_FEATURES = "x11" > > Thanks, > Jackie > > > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-05-23 7:01 ` [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe jackie.huang 2017-05-23 14:54 ` Khem Raj @ 2017-07-27 22:49 ` Saul Wold 2017-07-27 23:46 ` Khem Raj 1 sibling, 1 reply; 11+ messages in thread From: Saul Wold @ 2017-07-27 22:49 UTC (permalink / raw) To: jackie.huang, openembedded-devel On Tue, 2017-05-23 at 15:01 +0800, jackie.huang@windriver.com wrote: > > From: Jackie Huang <jackie.huang@windriver.com> > > mga is an Xorg driver for Matrox video cards > I missed the inclusion of this driver into meta-oe, we have been maintaining this driver in meta-intel and have been for a while (it's listed in layers.openembedded.org. If there are multiple layers using this Xorg driver, we should consider moving into oe-core proper. There are multiple x86* HW platforms that use the Matrox hardware still. I would prefer not to have meta-intel depending on meta-oe for one Xorg driver. Thoughts of moving it? Sau! > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 > ++++++++++++++++++++++ > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > 2 files changed, 89 insertions(+) > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga/checkfile.patch > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga_1.6.5.bb > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86- > video-mga/checkfile.patch > new file mode 100644 > index 000000000..ceae6dfba > --- /dev/null > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga/checkfile.patch > @@ -0,0 +1,68 @@ > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cg > i?id=57606] > +Signed-off-by: Ross Burton <ross.burton@intel.com> > + > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 > 2001 > +From: Ross Burton <ross.burton@intel.com> > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > + > +Automatically enabling or disabling a feature based on installed > files isn't > +deterministic, and AC_CHECK_FILE returns an error when cross- > compiling. > + > +Fix this by enabling DRI by default, and removing the explicit file > checks as > +pkg-config is good enough. > + > +(#57606) > + > +Signed-off-by: Ross Burton <ross.burton@intel.com> > +--- > + configure.ac | 25 ++----------------------- > + 1 file changed, 2 insertions(+), 23 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index fca1a9c..d2aa2ed 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > + [moduledir="$libdir/xorg/modules"]) > + > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > +- [Disable DRI support > [[default=auto]]]), > ++ [Disable DRI support > [[default=enabled]]]), > + [DRI="$enableval"], > +- [DRI=auto]) > ++ [DRI=yes]) > + AC_ARG_ENABLE(exa, > + AS_HELP_STRING([--disable-exa], > + [Disable EXA support > [[default=enabled]]]), > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg- > server` > + > + # Checks for libraries. > + > +-if 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], > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > +- [have_dristruct_h="yes"], > [have_dristruct_h="no"]) > +-fi > +- > +-AC_MSG_CHECKING([whether to include DRI support]) > +-if test "x$DRI" = xauto; then > +- if test "x$have_dri_h" = xyes && \ > +- test "x$have_sarea_h" = xyes && \ > +- test "x$have_dristruct_h" = xyes; then > +- DRI="yes" > +- else > +- DRI="no" > +- fi > +-fi > +-AC_MSG_RESULT([$DRI]) > +- > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > + if test "x$DRI" = xyes; then > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > +-- > +1.7.10.4 > + > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > mga_1.6.5.bb > new file mode 100644 > index 000000000..cd680597c > --- /dev/null > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > @@ -0,0 +1,21 @@ > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > + > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > + > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > + > +LIC_FILES_CHKSUM = > "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > + > +SRC_URI += "file://checkfile.patch" > + > +DEPENDS += "virtual/libx11 libpciaccess" > + > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > + > +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" > +SRC_URI[sha256sum] = > "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" > + > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'dri', '', d)}" > +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm > xf86driproto,xserver-xorg-extension-dri" > + > +RDEPENDS_${PN} = "xserver-xorg-module-exa" > -- > 2.11.0 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-07-27 22:49 ` Saul Wold @ 2017-07-27 23:46 ` Khem Raj 2017-07-28 15:05 ` Saul Wold 0 siblings, 1 reply; 11+ messages in thread From: Khem Raj @ 2017-07-27 23:46 UTC (permalink / raw) To: Saul Wold, jackie.huang, openembedded-devel On Thu, Jul 27, 2017 at 3:50 PM Saul Wold <sgw@linux.intel.com> wrote: > On Tue, 2017-05-23 at 15:01 +0800, jackie.huang@windriver.com wrote: > > > > From: Jackie Huang <jackie.huang@windriver.com> > > > > mga is an Xorg driver for Matrox video cards > > > I missed the inclusion of this driver into meta-oe, we have been > maintaining this driver in meta-intel and have been for a while (it's > listed in layers.openembedded.org. > > If there are multiple layers using this Xorg driver, we should consider > moving into oe-core proper. I think it falls into bsp area and unless we can Excercise it with qemu it just doesn't seem right to move to core I would even not put it in meta-oe > > There are multiple x86* HW platforms that use the Matrox hardware > still. I would prefer not to have meta-intel depending on meta-oe for > one Xorg driver. > > Thoughts of moving it? > > Sau! > > > > > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > > --- > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 > > ++++++++++++++++++++++ > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > > 2 files changed, 89 insertions(+) > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga/checkfile.patch > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga_1.6.5.bb > > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86- > > video-mga/checkfile.patch > > new file mode 100644 > > index 000000000..ceae6dfba > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga/checkfile.patch > > @@ -0,0 +1,68 @@ > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cg > > i?id=57606] > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > + > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 > > 2001 > > +From: Ross Burton <ross.burton@intel.com> > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > > + > > +Automatically enabling or disabling a feature based on installed > > files isn't > > +deterministic, and AC_CHECK_FILE returns an error when cross- > > compiling. > > + > > +Fix this by enabling DRI by default, and removing the explicit file > > checks as > > +pkg-config is good enough. > > + > > +(#57606) > > + > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > +--- > > + configure.ac | 25 ++----------------------- > > + 1 file changed, 2 insertions(+), 23 deletions(-) > > + > > +diff --git a/configure.ac b/configure.ac > > +index fca1a9c..d2aa2ed 100644 > > +--- a/configure.ac > > ++++ b/configure.ac > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > > + [moduledir="$libdir/xorg/modules"]) > > + > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > > +- [Disable DRI support > > [[default=auto]]]), > > ++ [Disable DRI support > > [[default=enabled]]]), > > + [DRI="$enableval"], > > +- [DRI=auto]) > > ++ [DRI=yes]) > > + AC_ARG_ENABLE(exa, > > + AS_HELP_STRING([--disable-exa], > > + [Disable EXA support > > [[default=enabled]]]), > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg- > > server` > > + > > + # Checks for libraries. > > + > > +-if 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], > > +- [have_sarea_h="yes"], [have_sarea_h="no"]) > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > > +- [have_dristruct_h="yes"], > > [have_dristruct_h="no"]) > > +-fi > > +- > > +-AC_MSG_CHECKING([whether to include DRI support]) > > +-if test "x$DRI" = xauto; then > > +- if test "x$have_dri_h" = xyes && \ > > +- test "x$have_sarea_h" = xyes && \ > > +- test "x$have_dristruct_h" = xyes; then > > +- DRI="yes" > > +- else > > +- DRI="no" > > +- fi > > +-fi > > +-AC_MSG_RESULT([$DRI]) > > +- > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > > + if test "x$DRI" = xyes; then > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > > +-- > > +1.7.10.4 > > + > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga_1.6.5.bb > > new file mode 100644 > > index 000000000..cd680597c > > --- /dev/null > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb > > @@ -0,0 +1,21 @@ > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > > + > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > > + > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > > + > > +LIC_FILES_CHKSUM = > > "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > > + > > +SRC_URI += "file://checkfile.patch" > > + > > +DEPENDS += "virtual/libx11 libpciaccess" > > + > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > + > > +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" > > +SRC_URI[sha256sum] = > > "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" > > + > > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > > 'dri', '', d)}" > > +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm > > xf86driproto,xserver-xorg-extension-dri" > > + > > +RDEPENDS_${PN} = "xserver-xorg-module-exa" > > -- > > 2.11.0 > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-07-27 23:46 ` Khem Raj @ 2017-07-28 15:05 ` Saul Wold 2017-07-28 15:47 ` Khem Raj 0 siblings, 1 reply; 11+ messages in thread From: Saul Wold @ 2017-07-28 15:05 UTC (permalink / raw) To: Khem Raj, jackie.huang, openembedded-devel On Thu, 2017-07-27 at 23:46 +0000, Khem Raj wrote: > > On Thu, Jul 27, 2017 at 3:50 PM Saul Wold <sgw@linux.intel.com> > wrote: > > On Tue, 2017-05-23 at 15:01 +0800, jackie.huang@windriver.com > > wrote: > > > > > > From: Jackie Huang <jackie.huang@windriver.com> > > > > > > mga is an Xorg driver for Matrox video cards > > > > > I missed the inclusion of this driver into meta-oe, we have been > > maintaining this driver in meta-intel and have been for a while > > (it's > > listed in layers.openembedded.org. > > > > If there are multiple layers using this Xorg driver, we should > > consider > > moving into oe-core proper. > > I think it falls into bsp area and unless we can > Excercise it with qemu it just doesn't seem right to move to core I > would even not put it in meta-oe > So your suggesting just update the meta-intel BSP with the newer version and remove it from meta-oe? Sau! > > > > > > There are multiple x86* HW platforms that use the Matrox hardware > > still. I would prefer not to have meta-intel depending on meta-oe > > for > > one Xorg driver. > > > > Thoughts of moving it? > > > > Sau! > > > > > > > > > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > > > --- > > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 > > > ++++++++++++++++++++++ > > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ > > > 2 files changed, 89 insertions(+) > > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- > > video- > > > mga/checkfile.patch > > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- > > video- > > > mga_1.6.5.bb > > > > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > > mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86- > > > video-mga/checkfile.patch > > > new file mode 100644 > > > index 000000000..ceae6dfba > > > --- /dev/null > > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > > mga/checkfile.patch > > > @@ -0,0 +1,68 @@ > > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bu > > g.cg > > > i?id=57606] > > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > > + > > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 > > 00:00:00 > > > 2001 > > > +From: Ross Burton <ross.burton@intel.com> > > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 > > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI > > > + > > > +Automatically enabling or disabling a feature based on installed > > > files isn't > > > +deterministic, and AC_CHECK_FILE returns an error when cross- > > > compiling. > > > + > > > +Fix this by enabling DRI by default, and removing the explicit > > file > > > checks as > > > +pkg-config is good enough. > > > + > > > +(#57606) > > > + > > > +Signed-off-by: Ross Burton <ross.burton@intel.com> > > > +--- > > > + configure.ac | 25 ++----------------------- > > > + 1 file changed, 2 insertions(+), 23 deletions(-) > > > + > > > +diff --git a/configure.ac b/configure.ac > > > +index fca1a9c..d2aa2ed 100644 > > > +--- a/configure.ac > > > ++++ b/configure.ac > > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, > > > + [moduledir="$libdir/xorg/modules"]) > > > + > > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], > > > +- [Disable DRI support > > > [[default=auto]]]), > > > ++ [Disable DRI support > > > [[default=enabled]]]), > > > + [DRI="$enableval"], > > > +- [DRI=auto]) > > > ++ [DRI=yes]) > > > + AC_ARG_ENABLE(exa, > > > + AS_HELP_STRING([--disable-exa], > > > + [Disable EXA support > > > [[default=enabled]]]), > > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg- > > > server` > > > + > > > + # Checks for libraries. > > > + > > > +-if 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], > > > +- [have_sarea_h="yes"], > > [have_sarea_h="no"]) > > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], > > > +- [have_dristruct_h="yes"], > > > [have_dristruct_h="no"]) > > > +-fi > > > +- > > > +-AC_MSG_CHECKING([whether to include DRI support]) > > > +-if test "x$DRI" = xauto; then > > > +- if test "x$have_dri_h" = xyes && \ > > > +- test "x$have_sarea_h" = xyes && \ > > > +- test "x$have_dristruct_h" = xyes; then > > > +- DRI="yes" > > > +- else > > > +- DRI="no" > > > +- fi > > > +-fi > > > +-AC_MSG_RESULT([$DRI]) > > > +- > > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) > > > + if test "x$DRI" = xyes; then > > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) > > > +-- > > > +1.7.10.4 > > > + > > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > > mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > > mga_1.6.5.bb > > > new file mode 100644 > > > index 000000000..cd680597c > > > --- /dev/null > > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- > > mga_1.6.5.bb > > > @@ -0,0 +1,21 @@ > > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc > > > + > > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" > > > + > > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" > > > + > > > +LIC_FILES_CHKSUM = > > > "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > > > + > > > +SRC_URI += "file://checkfile.patch" > > > + > > > +DEPENDS += "virtual/libx11 libpciaccess" > > > + > > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > > + > > > +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" > > > +SRC_URI[sha256sum] = > > > > > "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" > > > + > > > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', > > 'opengl', > > > 'dri', '', d)}" > > > +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm > > > xf86driproto,xserver-xorg-extension-dri" > > > + > > > +RDEPENDS_${PN} = "xserver-xorg-module-exa" > > > -- > > > 2.11.0 > > -- > > _______________________________________________ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe 2017-07-28 15:05 ` Saul Wold @ 2017-07-28 15:47 ` Khem Raj 0 siblings, 0 replies; 11+ messages in thread From: Khem Raj @ 2017-07-28 15:47 UTC (permalink / raw) To: Saul Wold; +Cc: openembeded-devel On Fri, Jul 28, 2017 at 8:05 AM, Saul Wold <sgw@linux.intel.com> wrote: > On Thu, 2017-07-27 at 23:46 +0000, Khem Raj wrote: >> >> On Thu, Jul 27, 2017 at 3:50 PM Saul Wold <sgw@linux.intel.com> >> wrote: >> > On Tue, 2017-05-23 at 15:01 +0800, jackie.huang@windriver.com >> > wrote: >> > > >> > > From: Jackie Huang <jackie.huang@windriver.com> >> > > >> > > mga is an Xorg driver for Matrox video cards >> > > >> > I missed the inclusion of this driver into meta-oe, we have been >> > maintaining this driver in meta-intel and have been for a while >> > (it's >> > listed in layers.openembedded.org. >> > >> > If there are multiple layers using this Xorg driver, we should >> > consider >> > moving into oe-core proper. >> >> I think it falls into bsp area and unless we can >> Excercise it with qemu it just doesn't seem right to move to core I >> would even not put it in meta-oe >> > So your suggesting just update the meta-intel BSP with the newer > version and remove it from meta-oe? right. May be between intel and amd, there should be a common layer too, since there are lot of x86 specific packages which are shared at architecture level. I am doing llvm right now and its only useful for x86 based systems there is no single place to put it and oe-core seems a bit of overkill. > > Sau! >> > >> > >> > There are multiple x86* HW platforms that use the Matrox hardware >> > still. I would prefer not to have meta-intel depending on meta-oe >> > for >> > one Xorg driver. >> > >> > Thoughts of moving it? >> > >> > Sau! >> > >> > >> > > >> > > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >> > > --- >> > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 >> > > ++++++++++++++++++++++ >> > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ >> > > 2 files changed, 89 insertions(+) >> > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- >> > video- >> > > mga/checkfile.patch >> > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- >> > video- >> > > mga_1.6.5.bb >> > > >> > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86- >> > > video-mga/checkfile.patch >> > > new file mode 100644 >> > > index 000000000..ceae6dfba >> > > --- /dev/null >> > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga/checkfile.patch >> > > @@ -0,0 +1,68 @@ >> > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bu >> > g.cg >> > > i?id=57606] >> > > +Signed-off-by: Ross Burton <ross.burton@intel.com> >> > > + >> > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 >> > 00:00:00 >> > > 2001 >> > > +From: Ross Burton <ross.burton@intel.com> >> > > +Date: Thu, 29 Nov 2012 11:00:43 +0000 >> > > +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI >> > > + >> > > +Automatically enabling or disabling a feature based on installed >> > > files isn't >> > > +deterministic, and AC_CHECK_FILE returns an error when cross- >> > > compiling. >> > > + >> > > +Fix this by enabling DRI by default, and removing the explicit >> > file >> > > checks as >> > > +pkg-config is good enough. >> > > + >> > > +(#57606) >> > > + >> > > +Signed-off-by: Ross Burton <ross.burton@intel.com> >> > > +--- >> > > + configure.ac | 25 ++----------------------- >> > > + 1 file changed, 2 insertions(+), 23 deletions(-) >> > > + >> > > +diff --git a/configure.ac b/configure.ac >> > > +index fca1a9c..d2aa2ed 100644 >> > > +--- a/configure.ac >> > > ++++ b/configure.ac >> > > +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, >> > > + [moduledir="$libdir/xorg/modules"]) >> > > + >> > > + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], >> > > +- [Disable DRI support >> > > [[default=auto]]]), >> > > ++ [Disable DRI support >> > > [[default=enabled]]]), >> > > + [DRI="$enableval"], >> > > +- [DRI=auto]) >> > > ++ [DRI=yes]) >> > > + AC_ARG_ENABLE(exa, >> > > + AS_HELP_STRING([--disable-exa], >> > > + [Disable EXA support >> > > [[default=enabled]]]), >> > > +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg- >> > > server` >> > > + >> > > + # Checks for libraries. >> > > + >> > > +-if 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], >> > > +- [have_sarea_h="yes"], >> > [have_sarea_h="no"]) >> > > +- AC_CHECK_FILE([${sdkdir}/dristruct.h], >> > > +- [have_dristruct_h="yes"], >> > > [have_dristruct_h="no"]) >> > > +-fi >> > > +- >> > > +-AC_MSG_CHECKING([whether to include DRI support]) >> > > +-if test "x$DRI" = xauto; then >> > > +- if test "x$have_dri_h" = xyes && \ >> > > +- test "x$have_sarea_h" = xyes && \ >> > > +- test "x$have_dristruct_h" = xyes; then >> > > +- DRI="yes" >> > > +- else >> > > +- DRI="no" >> > > +- fi >> > > +-fi >> > > +-AC_MSG_RESULT([$DRI]) >> > > +- >> > > + AM_CONDITIONAL(DRI, test "x$DRI" = xyes) >> > > + if test "x$DRI" = xyes; then >> > > + PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) >> > > +-- >> > > +1.7.10.4 >> > > + >> > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga_1.6.5.bb >> > > new file mode 100644 >> > > index 000000000..cd680597c >> > > --- /dev/null >> > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > mga_1.6.5.bb >> > > @@ -0,0 +1,21 @@ >> > > +require recipes-graphics/xorg-driver/xorg-driver-video.inc >> > > + >> > > +SUMMARY = "X.Org X server -- Matrox MGA display driver" >> > > + >> > > +DESCRIPTION = "mga is an Xorg driver for Matrox video cards" >> > > + >> > > +LIC_FILES_CHKSUM = >> > > "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" >> > > + >> > > +SRC_URI += "file://checkfile.patch" >> > > + >> > > +DEPENDS += "virtual/libx11 libpciaccess" >> > > + >> > > +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' >> > > + >> > > +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" >> > > +SRC_URI[sha256sum] = >> > > >> > "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" >> > > + >> > > +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', >> > 'opengl', >> > > 'dri', '', d)}" >> > > +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm >> > > xf86driproto,xserver-xorg-extension-dri" >> > > + >> > > +RDEPENDS_${PN} = "xserver-xorg-module-exa" >> > > -- >> > > 2.11.0 >> > -- >> > _______________________________________________ >> > Openembedded-devel mailing list >> > Openembedded-devel@lists.openembedded.org >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-oe][PATCH 2/2] ssiapi: add new recipe 2017-05-23 7:01 [meta-oe][PATCH 0/2] add new recipe for xf86-video-mga and ssiapi jackie.huang 2017-05-23 7:01 ` [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe jackie.huang @ 2017-05-23 7:01 ` jackie.huang 1 sibling, 0 replies; 11+ messages in thread From: jackie.huang @ 2017-05-23 7:01 UTC (permalink / raw) To: openembedded-devel From: Jackie Huang <jackie.huang@windriver.com> Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb new file mode 100644 index 000000000..5b951eb26 --- /dev/null +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Intel RSTe with Linux OS SSI API Library" + +DESCRIPTION = "Intel Rapid Storage Technology enterprise with Linux OS* Standard Storage Interface API Library. \ +The library allows user to manage storage devices including creating and managing Raid arrays on systems with Intel chipset." + +HOMEPAGE = "http://irstessi.sourceforge.net/" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=0413ff365e0bd733c4869a6797551c6f" + +DEPENDS += "sg3-utils" + +SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz" +SRC_URI[md5sum] = "02f16d7cbd30d28034093212906591f5" +SRC_URI[sha256sum] = "e10d283b0f211afb8ebd0bde87c097769613d30a052cdf164753e35e803264c7" + +S ="${WORKDIR}/${BPN}.${PV}" + +inherit autotools-brokensep + +do_configure_prepend(){ + ./autogen.sh +} + +RDEPENDS_${PN} += "mdadm" -- 2.11.0 ^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-07-28 15:47 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-05-23 7:01 [meta-oe][PATCH 0/2] add new recipe for xf86-video-mga and ssiapi jackie.huang 2017-05-23 7:01 ` [meta-oe][PATCH 1/2] xf86-video-mga: add new recipe jackie.huang 2017-05-23 14:54 ` Khem Raj 2017-05-23 19:36 ` Jussi Kukkonen 2017-05-24 2:11 ` Huang, Jie (Jackie) 2017-05-24 2:46 ` Khem Raj 2017-07-27 22:49 ` Saul Wold 2017-07-27 23:46 ` Khem Raj 2017-07-28 15:05 ` Saul Wold 2017-07-28 15:47 ` Khem Raj 2017-05-23 7:01 ` [meta-oe][PATCH 2/2] ssiapi: " jackie.huang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.