| Message ID | 20220724162500.2683871-21-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/x11r7: mass version bump | expand |
On 24/07/2022 18:25, Bernd Kuhls wrote: > Removed patch (and autoreconf) which was commited upstream: > https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [snip] > diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash > index 218e52e19c..813429789b 100644 > --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash > +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash > @@ -1,7 +1,5 @@ > -# From https://lists.x.org/archives/xorg-announce/2018-December/002933.html > -md5 b8fc99b4adea8bfe80156b13df4b6c9c xf86-video-mga-2.0.0.tar.bz2 > -sha1 833f2710a1fd7b3f2db3700b2ad055527da5033b xf86-video-mga-2.0.0.tar.bz2 > -sha256 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 xf86-video-mga-2.0.0.tar.bz2 > -sha512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540 xf86-video-mga-2.0.0.tar.bz2 > +# From https://lists.x.org/archives/xorg-announce/2022-July/003184.html > +sha256 27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab xf86-video-mga-2.0.1.tar.xz > +sha512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6 xf86-video-mga-2.0.1.tar.xz > # Locally computed > -sha256 6c567575e381478c7616eedff3ea2ae5228a5b54fbdd22d4070ebae312fa085c COPYING > +sha256 f69c2f4fd11ec4de7fcc23146187836eed1755aade3fef28b9204ea1a4adf61b COPYING As you should know, when the license file hash changes you should record in the commit message why it changed (to prove that there's no actual license change). In this case it was easy to find out so I did it myself: it's a spelling correction. Applied entire series to master with that fixed, thanks. Regards, Arnout > diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk > index 24f2da2cce..4841a643bc 100644 > --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk > +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk > @@ -4,12 +4,11 @@ > # > ################################################################################ > > -XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.0 > -XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 > -XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver > +XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.1 > +XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.xz > +XDRIVER_XF86_VIDEO_MGA_SITE = https://xorg.freedesktop.org/archive/individual/driver > XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT > XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING > -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES > XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto > > ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
diff --git a/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch b/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch deleted file mode 100644 index 5707bd1b3a..0000000000 --- a/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-mga-1.4.9/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200 -+++ xf86-video-mga-1.4.9/configure.ac 2007-06-10 12:00:37.000000000 +0200 -@@ -77,12 +77,18 @@ - AC_HEADER_STDC - - if test "x$DRI" != xno; then -+ if test "$cross_compiling" = no; 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"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash index 218e52e19c..813429789b 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002933.html -md5 b8fc99b4adea8bfe80156b13df4b6c9c xf86-video-mga-2.0.0.tar.bz2 -sha1 833f2710a1fd7b3f2db3700b2ad055527da5033b xf86-video-mga-2.0.0.tar.bz2 -sha256 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 xf86-video-mga-2.0.0.tar.bz2 -sha512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540 xf86-video-mga-2.0.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003184.html +sha256 27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab xf86-video-mga-2.0.1.tar.xz +sha512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6 xf86-video-mga-2.0.1.tar.xz # Locally computed -sha256 6c567575e381478c7616eedff3ea2ae5228a5b54fbdd22d4070ebae312fa085c COPYING +sha256 f69c2f4fd11ec4de7fcc23146187836eed1755aade3fef28b9204ea1a4adf61b COPYING diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 24f2da2cce..4841a643bc 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,12 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.0 -XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver +XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.1 +XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.xz +XDRIVER_XF86_VIDEO_MGA_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
Removed patch (and autoreconf) which was commited upstream: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/-/commit/f227f2f286123a9ca64b567783825a2c18b87971 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../0001-misc-fixes.patch | 21 ------------------- .../xdriver_xf86-video-mga.hash | 10 ++++----- .../xdriver_xf86-video-mga.mk | 7 +++---- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch