| Message ID | 20231207091300.1292252-1-alperyasinak1@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [meta-oe] xf86-video-mga: upgrade 2.0.0 -> 2.0.1 | expand |
On Thu, Dec 7, 2023 at 1:13 AM Alper Ak <alperyasinak1@gmail.com> wrote: > > * checkfile.patch removed because fixed in the new version -> https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 > * License-Update: Fix spelling/wording > > Changelog: > > * Fix uninitialized read in MGAEnableSecondOutPut > * gitlab CI: add a basic build test > * Fix spelling/wording issues > * Build xz tarballs instead of bzip2 > * configure.ac: fix cross-compilation > > Signed-off-by: alperak <alperyasinak1@gmail.com> > --- > .../xf86-video-mga/checkfile.patch | 68 ------------------- > ...o-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} | 8 +-- > 2 files changed, 3 insertions(+), 73 deletions(-) > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} (66%) > > 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 > deleted file mode 100644 > index ceae6dfba..000000000 > --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -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_2.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > similarity index 66% > rename from meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb > rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > index a9ae901d0..34b3e4cde 100644 > --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > @@ -4,16 +4,14 @@ 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" > +LIC_FILES_CHKSUM = "file://COPYING;md5=4aa220f495ce9be5ce4243d21ebac14f" Why did this checksum change? Please document the change in commit message with License-Update: <reason> > > DEPENDS += "virtual/libx11 libpciaccess" > > COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > -SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c" > -SRC_URI[sha256sum] = "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79" > +XORG_DRIVER_COMPRESSOR = ".tar.xz" > +SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab" > > PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" > PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#107275): https://lists.openembedded.org/g/openembedded-devel/message/107275 > Mute This Topic: https://lists.openembedded.org/mt/103031116/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
They just fixed the typo in a word. "MERCHANTIBILITY" -> "MERCHANTABILITY". Also, I already added it as a description -> "License-Update: Fix spelling/wording" https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/1e4dbef654bd31f5706b4b860f6b34c7e5e5f440 Khem Raj <raj.khem@gmail.com>, 7 Ara 2023 Per, 20:44 tarihinde şunu yazdı: > > On Thu, Dec 7, 2023 at 1:13 AM Alper Ak <alperyasinak1@gmail.com> wrote: > > > > * checkfile.patch removed because fixed in the new version -> https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 > > * License-Update: Fix spelling/wording > > > > Changelog: > > > > * Fix uninitialized read in MGAEnableSecondOutPut > > * gitlab CI: add a basic build test > > * Fix spelling/wording issues > > * Build xz tarballs instead of bzip2 > > * configure.ac: fix cross-compilation > > > > Signed-off-by: alperak <alperyasinak1@gmail.com> > > --- > > .../xf86-video-mga/checkfile.patch | 68 ------------------- > > ...o-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} | 8 +-- > > 2 files changed, 3 insertions(+), 73 deletions(-) > > delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} (66%) > > > > 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 > > deleted file mode 100644 > > index ceae6dfba..000000000 > > --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > +++ /dev/null > > @@ -1,68 +0,0 @@ > > -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_2.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > > similarity index 66% > > rename from meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb > > rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > > index a9ae901d0..34b3e4cde 100644 > > --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > > @@ -4,16 +4,14 @@ 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" > > +LIC_FILES_CHKSUM = "file://COPYING;md5=4aa220f495ce9be5ce4243d21ebac14f" > > Why did this checksum change? Please document the change in commit message with > > License-Update: <reason> > > > > > DEPENDS += "virtual/libx11 libpciaccess" > > > > COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > > > -SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c" > > -SRC_URI[sha256sum] = "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79" > > +XORG_DRIVER_COMPRESSOR = ".tar.xz" > > +SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab" > > > > PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" > > PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" > > -- > > 2.25.1 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#107275): https://lists.openembedded.org/g/openembedded-devel/message/107275 > > Mute This Topic: https://lists.openembedded.org/mt/103031116/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
On Thu, Dec 7, 2023 at 9:54 AM alper ak <alperyasinak1@gmail.com> wrote: > They just fixed the typo in a word. "MERCHANTIBILITY" -> > "MERCHANTABILITY". Also, I already added it as a description -> > "License-Update: Fix spelling/wording" That’s fine send that in with v2 > > > > https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/1e4dbef654bd31f5706b4b860f6b34c7e5e5f440 > > Khem Raj <raj.khem@gmail.com>, 7 Ara 2023 Per, 20:44 tarihinde şunu yazdı: > > > > On Thu, Dec 7, 2023 at 1:13 AM Alper Ak <alperyasinak1@gmail.com> wrote: > > > > > > * checkfile.patch removed because fixed in the new version -> > https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 > > > * License-Update: Fix spelling/wording > > > > > > Changelog: > > > > > > * Fix uninitialized read in MGAEnableSecondOutPut > > > * gitlab CI: add a basic build test > > > * Fix spelling/wording issues > > > * Build xz tarballs instead of bzip2 > > > * configure.ac: fix cross-compilation > > > > > > Signed-off-by: alperak <alperyasinak1@gmail.com> > > > --- > > > .../xf86-video-mga/checkfile.patch | 68 ------------------- > > > ...o-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} | 8 +-- > > > 2 files changed, 3 insertions(+), 73 deletions(-) > > > delete mode 100644 > meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > > rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-mga_2.0.0.bb > => xf86-video-mga_2.0.1.bb} (66%) > > > > > > 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 > > > deleted file mode 100644 > > > index ceae6dfba..000000000 > > > --- > a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch > > > +++ /dev/null > > > @@ -1,68 +0,0 @@ > > > -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_2.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_2.0.1.bb > > > similarity index 66% > > > rename from meta-oe/recipes-graphics/xorg-driver/ > xf86-video-mga_2.0.0.bb > > > rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > > > index a9ae901d0..34b3e4cde 100644 > > > --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb > > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb > > > @@ -4,16 +4,14 @@ 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" > > > +LIC_FILES_CHKSUM = > "file://COPYING;md5=4aa220f495ce9be5ce4243d21ebac14f" > > > > Why did this checksum change? Please document the change in commit > message with > > > > License-Update: <reason> > > > > > > > > DEPENDS += "virtual/libx11 libpciaccess" > > > > > > COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' > > > > > > -SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c" > > > -SRC_URI[sha256sum] = > "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79" > > > +XORG_DRIVER_COMPRESSOR = ".tar.xz" > > > +SRC_URI[sha256sum] = > "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab" > > > > > > PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'dri', '', d)}" > > > PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm > xorgproto,xserver-xorg-extension-dri" > > > -- > > > 2.25.1 > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > > Links: You receive all messages sent to this group. > > > View/Reply Online (#107275): > https://lists.openembedded.org/g/openembedded-devel/message/107275 > > > Mute This Topic: https://lists.openembedded.org/mt/103031116/1997914 > > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub > [raj.khem@gmail.com] > > > -=-=-=-=-=-=-=-=-=-=-=- > > > >
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 deleted file mode 100644 index ceae6dfba..000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch +++ /dev/null @@ -1,68 +0,0 @@ -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_2.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb similarity index 66% rename from meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb rename to meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb index a9ae901d0..34b3e4cde 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb @@ -4,16 +4,14 @@ 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" +LIC_FILES_CHKSUM = "file://COPYING;md5=4aa220f495ce9be5ce4243d21ebac14f" DEPENDS += "virtual/libx11 libpciaccess" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c" -SRC_URI[sha256sum] = "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79" +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri"
* checkfile.patch removed because fixed in the new version -> https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 * License-Update: Fix spelling/wording Changelog: * Fix uninitialized read in MGAEnableSecondOutPut * gitlab CI: add a basic build test * Fix spelling/wording issues * Build xz tarballs instead of bzip2 * configure.ac: fix cross-compilation Signed-off-by: alperak <alperyasinak1@gmail.com> --- .../xf86-video-mga/checkfile.patch | 68 ------------------- ...o-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} | 8 +-- 2 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch rename meta-oe/recipes-graphics/xorg-driver/{xf86-video-mga_2.0.0.bb => xf86-video-mga_2.0.1.bb} (66%)