Re: update xf86-video-amdgpu to latest git
@tech this combo has been working great for me the past few days. i have not encountered any sort of crash since doing a sysupgrade. $ sysctl kern.version kern.version=OpenBSD 6.9-current (GENERIC.MP) #158: Sat Jul 31 11:00:00 MDT 2021 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP $ fw_update -i Installed: vmm-firmware-1.14.0 amdgpu-firmware-20210716 rgc On Wed, Jul 21, 2021 at 05:36:08AM +0900, rgc wrote: > @tech > > i've been using this patch for a week > i've experience 4 hangs ... X hangs ... network is alive so i can do a safe > reboot > via ssh. last hang occured just 5 mins ago while watching some YouTube videos. > > 2 behaviours: > - video/screen freezes indifinitely, which requires me to login via ssh and > reboot > - video/screen freezes and X restarts, allowing me to just re-login > > > this laptop acts mostly like a server. it gets rebooted only when it hangs, > or if > there is a new snapshot. > > rgc > > On Sat, Jul 10, 2021 at 08:04:54AM +0900, rgc wrote: > > On Thu, Jul 08, 2021 at 05:29:01PM +1000, Jonathan Gray wrote: > > > The latest xf86-video-amdgpu release was in 2019. > > > > > > xf86-video-amdgpu-19.1.0..origin/master > > > > 8>< snipped > > > > just finished rebuilding xenocara > > build fine > > booted fine > > none of my previous issues (see links below) happening yet. > > > > -current: > > > > kern.version=OpenBSD 6.9-current (GENERIC.MP) #120: Thu Jul 8 23:45:06 MDT > > 2021 > > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP > > > > amdgpu0: PICASSO 10 CU rev 0x01 > > > > > > this were my system issues/reports: > > https://marc.info/?l=openbsd-misc=161131537616993=2 > > https://marc.info/?l=openbsd-misc=161736536311231=2 > > > > since my last update i have updated the BIOS FW (3.06) > > > > rgc > > >
Re: update xf86-video-amdgpu to latest git
On Thu, 8 Jul 2021 17:29:01 +1000 Jonathan Gray wrote: > The latest xf86-video-amdgpu release was in 2019. > > xf86-video-amdgpu-19.1.0..origin/master > > minus commits we already have > cb27a5b Handle NULL fb_ptr in pixmap_get_fb > e2cd67a Bail from amdgpu_pixmap_get_handle with ShadowFB > edcbe5f Fix link failure with gcc 10 > > With a X_PRIVSEP path added to amdgpu_probe.c to handle the change from > drmOpen() to open(). Works great. I do get a much stabler X experience. The DRM update to 5.10.* also was great, without regressions so far. But like with 5.7.* I still get the occassional [drm] *ERROR* ring sdma0 timeout, ... Which userland now handles pretty gracefully with this. Greetings Ben OpenBSD 6.9-current (GENERIC.MP) #151: Tue Jul 27 12:18:05 MDT 2021 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP real mem = 17069760512 (16278MB) avail mem = 16536481792 (15770MB) random: good seed from bootblocks mpath0 at root scsibus0 at mpath0: 256 targets mainbus0 at root bios0 at mainbus0: SMBIOS rev. 3.2 @ 0x8f1a6000 (94 entries) bios0: vendor American Megatrends Inc. version "2301" date 07/10/2020 bios0: ASUSTeK COMPUTER INC. ROG STRIX B360-G GAMING acpi0 at bios0: ACPI 6.1 acpi0: sleep states S0 S3 S4 S5 acpi0: tables DSDT FACP APIC FPDT FIDT MCFG WSMT SSDT SSDT SSDT HPET SSDT SSDT UEFI LPIT SSDT SSDT DBGP DBG2 DMAR SSDT BGRT acpi0: wakeup devices PEG0(S4) PEGP(S4) PEG1(S4) PEGP(S4) PEG2(S4) PEGP(S4) SIO1(S3) UAR1(S4) RP01(S4) PXSX(S4) RP02(S4) PXSX(S4) RP03(S4) PXSX(S4) RP04(S4) PXSX(S4) [...] acpitimer0 at acpi0: 3579545 Hz, 24 bits acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: Intel(R) Core(TM) i3-9100 CPU @ 3.60GHz, 3593.04 MHz, 06-9e-0b cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu0: 256KB 64b/line 8-way L2 cache cpu0: smt 0, core 0, package 0 mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges cpu0: apic clock running at 24MHz cpu0: mwait min=64, max=64, C-substates=0.2.1.2.4.1.1.1, IBE cpu1 at mainbus0: apid 2 (application processor) cpu1: Intel(R) Core(TM) i3-9100 CPU @ 3.60GHz, 3591.64 MHz, 06-9e-0b cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu1: 256KB 64b/line 8-way L2 cache cpu1: smt 0, core 1, package 0 cpu2 at mainbus0: apid 4 (application processor) cpu2: Intel(R) Core(TM) i3-9100 CPU @ 3.60GHz, 3591.64 MHz, 06-9e-0b cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu2: 256KB 64b/line 8-way L2 cache cpu2: smt 0, core 2, package 0 cpu3 at mainbus0: apid 6 (application processor) cpu3: Intel(R) Core(TM) i3-9100 CPU @ 3.60GHz, 3591.64 MHz, 06-9e-0b cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,SGX,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,MPX,RDSEED,ADX,SMAP,CLFLUSHOPT,PT,SRBDS_CTRL,MD_CLEAR,TSXFA,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES,MELTDOWN cpu3: 256KB 64b/line 8-way L2 cache cpu3: smt 0, core 3, package 0 ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 120 pins acpimcfg0 at acpi0 acpimcfg0: addr 0xe000, bus 0-255 acpihpet0 at acpi0: 2399 Hz acpiprt0 at acpi0: bus 0 (PCI0) acpiprt1 at acpi0: bus 1 (PEG0) acpiprt2 at acpi0: bus -1 (PEG1) acpiprt3 at acpi0: bus -1 (PEG2) acpiprt4 at acpi0: bus -1 (RP01) acpiprt5 at acpi0: bus -1 (RP02) acpiprt6 at acpi0: bus -1
Re: update xf86-video-amdgpu to latest git
@tech i've been using this patch for a week i've experience 4 hangs ... X hangs ... network is alive so i can do a safe reboot via ssh. last hang occured just 5 mins ago while watching some YouTube videos. 2 behaviours: - video/screen freezes indifinitely, which requires me to login via ssh and reboot - video/screen freezes and X restarts, allowing me to just re-login this laptop acts mostly like a server. it gets rebooted only when it hangs, or if there is a new snapshot. rgc On Sat, Jul 10, 2021 at 08:04:54AM +0900, rgc wrote: > On Thu, Jul 08, 2021 at 05:29:01PM +1000, Jonathan Gray wrote: > > The latest xf86-video-amdgpu release was in 2019. > > > > xf86-video-amdgpu-19.1.0..origin/master > > 8>< snipped > > just finished rebuilding xenocara > build fine > booted fine > none of my previous issues (see links below) happening yet. > > -current: > > kern.version=OpenBSD 6.9-current (GENERIC.MP) #120: Thu Jul 8 23:45:06 MDT > 2021 > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP > > amdgpu0: PICASSO 10 CU rev 0x01 > > > this were my system issues/reports: > https://marc.info/?l=openbsd-misc=161131537616993=2 > https://marc.info/?l=openbsd-misc=161736536311231=2 > > since my last update i have updated the BIOS FW (3.06) > > rgc >
Re: update xf86-video-amdgpu to latest git
On Thu, Jul 8, 2021, at 7:29 AM, Jonathan Gray wrote: > The latest xf86-video-amdgpu release was in 2019. > > xf86-video-amdgpu-19.1.0..origin/master Hi, Tested this patch on -current with a RX5600XT (Navi 10 XLE). It works great and seems to have fixed the occasional X crash that I would get. - Evan Burkey d...@fputs.com
Re: update xf86-video-amdgpu to latest git
On Thu, Jul 08, 2021 at 05:29:01PM +1000, Jonathan Gray wrote: > The latest xf86-video-amdgpu release was in 2019. > > xf86-video-amdgpu-19.1.0..origin/master 8>< snipped just finished rebuilding xenocara build fine booted fine none of my previous issues (see links below) happening yet. -current: kern.version=OpenBSD 6.9-current (GENERIC.MP) #120: Thu Jul 8 23:45:06 MDT 2021 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP amdgpu0: PICASSO 10 CU rev 0x01 this were my system issues/reports: https://marc.info/?l=openbsd-misc=161131537616993=2 https://marc.info/?l=openbsd-misc=161736536311231=2 since my last update i have updated the BIOS FW (3.06) rgc
Re: update xf86-video-amdgpu to latest git
Hello, X1 gen5 continues to work fine. X1 gen9 x11 stopped crashing and is now usable! (Tiger lake) Thank you! Eric On Thu, 8 Jul 2021 at 09:41, Jonathan Gray wrote: > > The latest xf86-video-amdgpu release was in 2019. > > xf86-video-amdgpu-19.1.0..origin/master > > minus commits we already have > cb27a5b Handle NULL fb_ptr in pixmap_get_fb > e2cd67a Bail from amdgpu_pixmap_get_handle with ShadowFB > edcbe5f Fix link failure with gcc 10 > > With a X_PRIVSEP path added to amdgpu_probe.c to handle the change from > drmOpen() to open(). > > aedbf47 Include xf86drm.h instead of sarea.h > 6ed4863 Drop dri.h includes > 6234a1b Fix drmmode_crtc_scanout_create logic > 6bd3dc6 Check for AMDGPU_CREATE_PIXMAP_SCANOUT in amdgpu_glamor_create_pixmap > 2202cdf Replace a few more instances of "master" > 0d1d479 Fix build against ABI_VIDEODRV_VERSION 25.2 > 442efe7 Make drmmode_crtc_scanout_create/destroy static > 99f3c82 Drop struct drmmode_scanout altogether in favour of PixmapPtrs > cfce4b3 Drop bo/width/height members from struct drmmode_scanout > 680b9a2 Fix return value check of drmIoctl() > e923642 gitlab CI: update to use the latest CI templates > 0732f81 glamor: Make pixmap scanout compatible if its dimensions are > 42a3148 Factor out common code to amdgpu_probe() > eeaaf37 Introduce amdgpu_device_setup helper > 1c9742e Kill off drmOpen/Close/drmSetInterfaceVersion in favour of drmDevices > 2dd7307 Use the device_id straight from gpu_info > 655b3c5 Reuse the existing busid string > b357a84 Store the busid string in AMDGPUEnt > 2c0c154 Remove NULL check after a "cannot fail" function > 16ae0d0 Fixup the amdgpu_bus_id() string format > abbe23f Remove drmCheckModesettingSupported and kernel module loading, on > Linux > 0b3bc7a Use ODEV_ATTRIB_PATH where possible for the device node. > fd66f5c kms: Handle changes to SourceValidate call chain in xserver 19 > > Index: driver/xf86-video-amdgpu/Makefile.in > === > RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/Makefile.in,v > retrieving revision 1.2 > diff -u -p -r1.2 Makefile.in > --- driver/xf86-video-amdgpu/Makefile.in16 Apr 2019 01:59:34 - > 1.2 > +++ driver/xf86-video-amdgpu/Makefile.in8 Jul 2021 07:13:57 - > @@ -314,6 +314,7 @@ pdfdir = @pdfdir@ > prefix = @prefix@ > program_transform_name = @program_transform_name@ > psdir = @psdir@ > +runstatedir = @runstatedir@ > sbindir = @sbindir@ > sharedstatedir = @sharedstatedir@ > srcdir = @srcdir@ > Index: driver/xf86-video-amdgpu/README.md > === > RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/README.md,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 README.md > --- driver/xf86-video-amdgpu/README.md 16 Apr 2019 01:49:01 - > 1.1.1.1 > +++ driver/xf86-video-amdgpu/README.md 7 Jul 2021 13:42:19 - > @@ -9,7 +9,7 @@ Please > to the Xorg bugzilla. > > The > -[master development code > repository](https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu) > +[main development code > repository](https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu) > can be found at FreeDesktop Gitlab. > > Please use merge requests for patch submission. > Index: driver/xf86-video-amdgpu/aclocal.m4 > === > RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/aclocal.m4,v > retrieving revision 1.2 > diff -u -p -r1.2 aclocal.m4 > --- driver/xf86-video-amdgpu/aclocal.m4 16 Apr 2019 01:59:34 - 1.2 > +++ driver/xf86-video-amdgpu/aclocal.m4 8 Jul 2021 07:13:54 - > @@ -19,9 +19,9 @@ You have another version of autoconf. I > If you have problems, you may need to regenerate the build system entirely. > To do so, use the procedure documented by the package, typically > 'autoreconf'.])]) > > -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- > -dnl serial 11 (pkg-config-0.29.1) > -dnl > +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- > +# serial 12 (pkg-config-0.29.2) > + > dnl Copyright Š 2004 Scott James Remnant . > dnl Copyright Š 2012-2015 Dan Nicholson > dnl > @@ -62,7 +62,7 @@ dnl > dnl See the "Since" comment for each macro you use to see what version > dnl of the macros you require. > m4_defun([PKG_PREREQ], > -[m4_define([PKG_MACROS_VERSION], [0.29.1]) > +[m4_define([PKG_MACROS_VERSION], [0.29.2]) > m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, > [m4_fatal([pkg.m4 version $1 or higher is required but > ]PKG_MACROS_VERSION[ found])]) > ])dnl PKG_PREREQ > @@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler fl > AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl > > pkg_failed=no > -AC_MSG_CHECKING([for $1]) > +AC_MSG_CHECKING([for $2]) > > _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) > _PKG_CONFIG([$1][_LIBS], [libs], [$2]) > @@ -173,11 +173,11 @@ and $1[]_LIBS
Re: update xf86-video-amdgpu to latest git
On Thu, Jul 08, 2021 at 05:29:01PM +1000, Jonathan Gray wrote: > The latest xf86-video-amdgpu release was in 2019. > > xf86-video-amdgpu-19.1.0..origin/master Hi, Works so far here on my X395 (Vega Mobile 8) with -current. -- Matthieu Herrb
update xf86-video-amdgpu to latest git
The latest xf86-video-amdgpu release was in 2019. xf86-video-amdgpu-19.1.0..origin/master minus commits we already have cb27a5b Handle NULL fb_ptr in pixmap_get_fb e2cd67a Bail from amdgpu_pixmap_get_handle with ShadowFB edcbe5f Fix link failure with gcc 10 With a X_PRIVSEP path added to amdgpu_probe.c to handle the change from drmOpen() to open(). aedbf47 Include xf86drm.h instead of sarea.h 6ed4863 Drop dri.h includes 6234a1b Fix drmmode_crtc_scanout_create logic 6bd3dc6 Check for AMDGPU_CREATE_PIXMAP_SCANOUT in amdgpu_glamor_create_pixmap 2202cdf Replace a few more instances of "master" 0d1d479 Fix build against ABI_VIDEODRV_VERSION 25.2 442efe7 Make drmmode_crtc_scanout_create/destroy static 99f3c82 Drop struct drmmode_scanout altogether in favour of PixmapPtrs cfce4b3 Drop bo/width/height members from struct drmmode_scanout 680b9a2 Fix return value check of drmIoctl() e923642 gitlab CI: update to use the latest CI templates 0732f81 glamor: Make pixmap scanout compatible if its dimensions are 42a3148 Factor out common code to amdgpu_probe() eeaaf37 Introduce amdgpu_device_setup helper 1c9742e Kill off drmOpen/Close/drmSetInterfaceVersion in favour of drmDevices 2dd7307 Use the device_id straight from gpu_info 655b3c5 Reuse the existing busid string b357a84 Store the busid string in AMDGPUEnt 2c0c154 Remove NULL check after a "cannot fail" function 16ae0d0 Fixup the amdgpu_bus_id() string format abbe23f Remove drmCheckModesettingSupported and kernel module loading, on Linux 0b3bc7a Use ODEV_ATTRIB_PATH where possible for the device node. fd66f5c kms: Handle changes to SourceValidate call chain in xserver 19 Index: driver/xf86-video-amdgpu/Makefile.in === RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/Makefile.in,v retrieving revision 1.2 diff -u -p -r1.2 Makefile.in --- driver/xf86-video-amdgpu/Makefile.in16 Apr 2019 01:59:34 - 1.2 +++ driver/xf86-video-amdgpu/Makefile.in8 Jul 2021 07:13:57 - @@ -314,6 +314,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ Index: driver/xf86-video-amdgpu/README.md === RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/README.md,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 README.md --- driver/xf86-video-amdgpu/README.md 16 Apr 2019 01:49:01 - 1.1.1.1 +++ driver/xf86-video-amdgpu/README.md 7 Jul 2021 13:42:19 - @@ -9,7 +9,7 @@ Please to the Xorg bugzilla. The -[master development code repository](https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu) +[main development code repository](https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu) can be found at FreeDesktop Gitlab. Please use merge requests for patch submission. Index: driver/xf86-video-amdgpu/aclocal.m4 === RCS file: /cvs/xenocara/driver/xf86-video-amdgpu/aclocal.m4,v retrieving revision 1.2 diff -u -p -r1.2 aclocal.m4 --- driver/xf86-video-amdgpu/aclocal.m4 16 Apr 2019 01:59:34 - 1.2 +++ driver/xf86-video-amdgpu/aclocal.m4 8 Jul 2021 07:13:54 - @@ -19,9 +19,9 @@ You have another version of autoconf. I If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -62,7 +62,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler fl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) +AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` -else +
