From 528fa005870322ec4cd128a85f67b49f89a7409e Mon Sep 17 00:00:00 2001 From: lingsheng <860373352@qq.com> Date: Thu, 1 Aug 2024 03:26:51 +0000 Subject: [PATCH] configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL --- ..._INIT-from-libtool-2-instead-of-depr.patch | 38 +++++++++++++++++++ xorg-x11-drv-fbdev.spec | 8 +++- xorg-x11-drv-fbdev.yaml | 8 ++-- 3 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch diff --git a/backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch b/backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch new file mode 100644 index 0000000..dce8735 --- /dev/null +++ b/backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch @@ -0,0 +1,38 @@ +From 554d6fda2144dcc879e09297518df5e9fee87855 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sun, 7 Jan 2024 09:17:53 -0800 +Subject: [PATCH] configure: Use LT_INIT from libtool 2 instead of deprecated + AC_PROG_LIBTOOL + +AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, +so it's time to rely on it. + +Clears autoconf warnings: + +configure.ac:44: warning: The macro 'AC_PROG_LIBTOOL' is obsolete. +configure.ac:44: You should run autoupdate. +aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from... +configure.ac:44: the top level + +Signed-off-by: Alan Coopersmith +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fb6f9fe..0f39968 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,8 +40,7 @@ XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + + # Initialize libtool +-AC_DISABLE_STATIC +-AC_PROG_LIBTOOL ++LT_INIT([disable-static]) + + AH_TOP([#include "xorg-server.h"]) + +-- +2.33.0 + diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index 077f815..afaab46 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -1,16 +1,17 @@ %global moduledir %(pkg-config xorg-server --variable=moduledir ) -%global driverdir %{moduledir}/drivers +%global driverdir %{moduledir}/drivers %undefine _hardened_build Name: xorg-x11-drv-fbdev Version: 0.5.0 -Release: 6 +Release: 7 Summary: Xorg X11 fbdev video driver License: MIT URL: https://www.x.org Source0: https://www.x.org/pub/individual/driver/xf86-video-fbdev-%{version}.tar.bz2 Patch6000: BGNoneRoot.patch +Patch6001: backport-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch BuildRequires: xorg-x11-server-devel autoconf automake libtool @@ -46,6 +47,9 @@ make %{_mandir}/man4/fbdev.4* %changelog +* Thu Aug 01 2024 lingsheng - 0.5.0-7 +- configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL + * Mon Apr 11 2022 xingxing - 0.5.0-6 - enable patch diff --git a/xorg-x11-drv-fbdev.yaml b/xorg-x11-drv-fbdev.yaml index 784b26c..0c39bfc 100644 --- a/xorg-x11-drv-fbdev.yaml +++ b/xorg-x11-drv-fbdev.yaml @@ -1,4 +1,4 @@ -version_control: github -src_repo: eurolinux-enterprise-linux-sources/xorg-x11-drv-fbdev -tag_prefix: -seperator: . +version_control: git +src_repo: https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev.git +tag_prefix: xf86-video-fbdev- +separator: .