2
1
Эх сурвалжийг харах

directfb: bump version, unbreak png support

The recent libpng bump broke png support in directfb, as it relied
on the legacy 1.2 interface. Fix it by bumping the directfb version,
and at the same time ensure that configure finds our cross-libpng-config
rather than what the host version the user might have in the path.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 жил өмнө
parent
commit
f8b8a48827

+ 3 - 3
CHANGES

@@ -25,9 +25,9 @@
 
 
 	Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
 	Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
 	automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
 	automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
-	bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, dmraid,
-	docker, dosfstools, dropbear, e2fsprogs, expat, ezxml, fbset,
-	fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk,
+	bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, directfb,
+	dmraid, docker, dosfstools, dropbear, e2fsprogs, expat, ezxml,
+	fbset, fconfig, ffmpeg, freetype, gadgetfs-test, gamin, gawk,
 	genext2fs, gperf, gst-plugins-ugly, gtk2-themes, gtkperf,
 	genext2fs, gperf, gst-plugins-ugly, gtk2-themes, gtkperf,
 	gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, imagemagick,
 	gvfs, haserl, hdparm, hostapd, hwdata, ifplugd, imagemagick,
 	iperf, ipsec-tools, iproute2, iptables, iw, jpeg, kexec,
 	iperf, ipsec-tools, iproute2, iptables, iw, jpeg, kexec,

+ 2 - 1
package/directfb/directfb.mk

@@ -4,7 +4,7 @@
 #
 #
 #############################################################
 #############################################################
 DIRECTFB_VERSION_MAJOR:=1.4
 DIRECTFB_VERSION_MAJOR:=1.4
-DIRECTFB_VERSION:=1.4.3
+DIRECTFB_VERSION:=1.4.5
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
 DIRECTFB_AUTORECONF = NO
 DIRECTFB_AUTORECONF = NO
@@ -104,6 +104,7 @@ endif
 ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y)
 ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y)
 DIRECTFB_PNG:=--enable-png
 DIRECTFB_PNG:=--enable-png
 DIRECTFB_DEP+= libpng
 DIRECTFB_DEP+= libpng
+DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
 else
 else
 DIRECTFB_PNG:=--disable-png
 DIRECTFB_PNG:=--disable-png
 endif
 endif