A bunch of bumps (branch yem/bumps)
cover A bunch of bumps (branch yem/bumps)
From: "Yann E. MORIN" <[email protected]>
Hello All!
This series has been sitting here waiting for the last release to be out. It is now, so here are the bumps.
Regards,
Yann E. MORIN.
The following changes since commit 3663bc4ff295b98fbbc1aafb38fdbc46fee7c80e:
qhull: do not override CMAKE_BUILD_TYPE (2014-06-01 22:21:05 +0200)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/bumps
for you to fetch changes up to b9520f0ec1d88f5206efc7c34545108c1e396482:
[WIP] package/weston: add support for the RDP compositor (2014-06-01 23:00:03 +0200)
----------------------------------------------------------------
Yann E. MORIN (26):
package/rpi-firmware: bump
configs: bump kernel used for the RPi package/linux-firmware: bump version package/linux-firmware: install new Broadcom 43xxx firmware package/nut: bump to latest stable
package/tzdata: bump version for some new timezones package/zic: bump version for misc fixes package/dtv-scan-tables: bump version package/tvheadend: bump version
package/w_scan: do not line-up variables package/w_scan: bump version
package/libbsd: do not line-up variables package/libbsd: bump version
package/snappy: do not line-up variables package/snappy: bump version
package/libevdev: bump version
package/procps: bump version and rename to procps-ng package/wayland: bump version
package/weston: bump version
package/weston: libxkbcommon is optional package/libinput: new package
package/weston: add support for libinput package/freerdp: not forcibly depend on X.Org pacakge/freerdp: disable building the manpages package/freerdp: add options to enable/disable server and/or client [WIP] package/weston: add support for the RDP compositor
configs/raspberrypi_defconfig | 4 +-
package/Config.in | 5 +-
package/dtv-scan-tables/dtv-scan-tables.mk | 4 +-
package/freerdp/Config.in | 31 ++++++++++--
package/freerdp/freerdp.mk | 32 ++++++++++--
package/libbsd/libbsd.mk | 9 ++--
package/libevdev/libevdev.mk | 2 +-
package/libinput/Config.in | 17 +++++++
package/libinput/libinput.mk | 19 ++++++++
package/linux-firmware/Config.in | 5 +-
package/linux-firmware/linux-firmware.mk | 9 +++-
package/nut/nut.mk | 7 +--
package/{procps => procps-ng}/Config.in | 0
package/procps-ng/procps-0000-remove-index.patch | 16 ++++++
package/procps-ng/procps.mk | 15 ++++++
package/procps/procps-make-3.82.patch | 23 ---------
package/procps/procps-remove-flags.patch | 26 ----------
package/procps/procps-remove-index.patch | 21 --------
package/procps/procps-wchar.patch | 29 -----------
package/procps/procps.mk | 25 ----------
package/rpi-firmware/rpi-firmware.mk | 2 +-
package/snappy/snappy.mk | 10 ++--
package/tvheadend/tvheadend.mk | 2 +-
package/tzdata/tzdata.mk | 2 +-
package/w_scan/w_scan.mk | 14 +++---
package/wayland/wayland.mk | 4 +-
package/weston/Config.in | 16 +++++-
...0-compositor-rpi-fix-input-initialization.patch | 57 ----------------------
package/weston/weston-0000-safe-foreach.patch | 36 ++++++++++++++
package/weston/weston-0003-dont-build-tests.patch | 17 -------
package/weston/weston.mk | 28 +++++++++--
package/zic/zic.mk | 2 +-
32 files changed, 238 insertions(+), 251 deletions(-)
create mode 100644 package/libinput/Config.in
create mode 100644 package/libinput/libinput.mk
rename package/{procps => procps-ng}/Config.in (100%)
create mode 100644 package/procps-ng/procps-0000-remove-index.patch
create mode 100644 package/procps-ng/procps.mk
delete mode 100644 package/procps/procps-make-3.82.patch
delete mode 100644 package/procps/procps-remove-flags.patch
delete mode 100644 package/procps/procps-remove-index.patch
delete mode 100644 package/procps/procps-wchar.patch
delete mode 100644 package/procps/procps.mk
delete mode 100644 package/weston/weston-0000-compositor-rpi-fix-input-initialization.patch
create mode 100644 package/weston/weston-0000-safe-foreach.patch
delete mode 100644 package/weston/weston-0003-dont-build-tests.patchSignature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/26 package/rpi-firmware: bump
From: "Yann E. MORIN" <[email protected]>
Yet another bump for the Raspberry Pi firmware:
- HDMI: EDID override; HDCP fix; add command to control power to HDMI phy; fixes to mode selection
- GPU: enable use of HW cursor; fix for GLES FFT compliance; fix scaling; remove arbitrary restrictions on output sizes
- video-decode: better handle corrupted h264 streams, better allocate memory
- misc: choose composite video when HDMI is not plugged
--- package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-firmware/rpi-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = c8881991d9181779aee9637d6f4b215f108021a3 +RPI_FIRMWARE_VERSION = f15c3b5e4018b974de30d95d3173b1e936f66bd7 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3c RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Signature · 1 line
1.8.3.2
PATCH 1/26 package/rpi-firmware: bump
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
Yet another bump for the Raspberry Pi firmware:
- HDMI: EDID override; HDCP fix; add command to control power to HDMI phy; fixes to mode selection
- GPU: enable use of HW cursor; fix for GLES FFT compliance; fix scaling; remove arbitrary restrictions on output sizes
- video-decode: better handle corrupted h264 streams, better allocate memory
- misc: choose composite video when HDMI is not plugged
Quoted 1 line
Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/26 configs: bump kernel used for the RPi
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
The rpi-3.12.y branch has now been merged with the 3.12.20 upstream, and contains some fixes for FIQ, v4l2, i2c, USB, and 1-wire GPIOs.
Bump kernel headers used for the toolchain at the same time.
--- configs/raspberrypi_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configs/raspberrypi_defconfig +2 -2
@@ -10,13 +10,13 @@ BR2_PACKAGE_RPI_FIRMWARE=y # Lock to 3.12 headers as the RPi kernel is based off the 3.12 branch BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.12.18" +BR2_DEFAULT_KERNEL_VERSION="3.12.20" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b09a27249d61475e4423607f7632a5aa6e7b3a53" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a25152fdfbfd3b4330da16fc3aeb6b1ef8843805" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi_quick" BR2_LINUX_KERNEL_ZIMAGE=y
Signature · 1 line
1.8.3.2
PATCH 2/26 configs: bump kernel used for the RPi
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
The rpi-3.12.y branch has now been merged with the 3.12.20 upstream, and contains some fixes for FIQ, v4l2, i2c, USB, and 1-wire GPIOs.Bump kernel headers used for the toolchain at the same time.
Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/26 package/linux-firmware: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
This bump brings in a new version of the iwlwifi firmware.
--- package/linux-firmware/linux-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/linux-firmware/linux-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = f8c22c692bdee57a20b092e647464ff6176df3ed +LINUX_FIRMWARE_VERSION = 4a050f5524a09c35192273e3a5d741f63e7bf7d6 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git
Signature · 1 line
1.8.3.2
PATCH 3/26 package/linux-firmware: bump version
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]> This bump brings in a new version of the iwlwifi firmware.
Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/26 package/linux-firmware: install new Broadcom 43xxx firmware
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
This installs firmware files for the FullMAC series of Broadcom WiFi devices.
--- package/linux-firmware/Config.in | 5 +++-- package/linux-firmware/linux-firmware.mk | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
package/linux-firmware/Config.in +3 -2
@@ -26,9 +26,10 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 Firmware files for the Atheros 9271 module config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX - bool "Broadcom BRCM bcm43xx" + bool "Broadcom BRCM bcm43xx/43xxx" help - Firmware files for the Broadcom BRCM bcm43xx + Firmware files for the Broadcom bcm43xx and bcm43xxx, + SoftMAC and FullMAC. config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 bool "Intel iwlwifi 3160"
package/linux-firmware/linux-firmware.mk +6 -1
@@ -185,7 +185,12 @@ endif # brcm ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX),y) -LINUX_FIRMWARE_FILES += brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw +LINUX_FIRMWARE_FILES += brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \ + brcm/bcm4329-fullmac-4.bin brcm/brcmfmac43236b.bin \ + brcm/brcmfmac43241b0-sdio.bin brcm/brcmfmac43241b4-sdio.bin \ + brcm/brcmfmac4329-sdio.bin brcm/brcmfmac4330-sdio.bin \ + brcm/brcmfmac4334-sdio.bin brcm/brcmfmac4335-sdio.bin \ + brcm/brcmfmac43362-sdio.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif
Signature · 1 line
1.8.3.2
PATCH 4/26 package/linux-firmware: install new Broadcom 43xxx firmware
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
This installs firmware files for the FullMAC series of Broadcom WiFi devices.Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/26 package/nut: bump to latest stable
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Our patch is still valid, but it now builds fine with // builds (tested many times with up to 128 // jobs, without failure.)
--- package/nut/nut.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
package/nut/nut.mk +2 -5
@@ -4,8 +4,8 @@ # ################################################################################ -NUT_VERSION_MAJOR = 2.6 -NUT_VERSION = $(NUT_VERSION_MAJOR).5 +NUT_VERSION_MAJOR = 2.7 +NUT_VERSION = $(NUT_VERSION_MAJOR).2 NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)/ NUT_LICENSE = GPLv2+, GPLv3+ (python scripts), GPL/Artistic (perl client) NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
@@ -14,9 +14,6 @@ NUT_DEPENDENCIES = host-pkgconf # Our patch changes m4 macros, so we need to autoreconf NUT_AUTORECONF = YES -# Disable parallel builds -NUT_MAKE = $(MAKE1) - # Put the PID files in a read-write place (/var/run is a tmpfs) # since the default location (/var/state/ups) maybe readonly. NUT_CONF_OPT = \
Signature · 1 line
1.8.3.2
PATCH 5/26 package/nut: bump to latest stable
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
Our patch is still valid, but it now builds fine with // builds (tested many times with up to 128 // jobs, without failure.)Signed-off-by "Yann E. MORIN" <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/26 package/tzdata: bump version for some new timezones
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
A few adjustments here and there, plus re-definition of the Crimea timezone.
New definition for the moment the Big-Bang occured, too. :-)
--- package/tzdata/tzdata.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tzdata/tzdata.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2014a +TZDATA_VERSION = 2014d TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases TZDATA_DEPENDENCIES = host-zic
Signature · 1 line
1.8.3.2
PATCH 6/26 package/tzdata: bump version for some new timezones
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]> A few adjustments here and there, plus re-definition of the Crimea timezone.
New definition for the moment the Big-Bang occured, too. :-)
Signed-off-by "Yann E. MORIN" <[email protected]>
While reading lwn.net, I noticed this:
https://bugzilla.gnome.org/show_bug.cgi?id=730332
Have you noticed isses with glib-based programs? Do we need to patch glib?
Quoted 24 lines
--- package/tzdata/tzdata.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/tzdata/tzdata.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2014a +TZDATA_VERSION = 2014d TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases TZDATA_DEPENDENCIES = host-zicSignature · 6 lines
1.8.3.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/26 package/tzdata: bump version for some new timezones
Peter, All,
On 2014-06-06 12:59 +0200, Peter Korsgaard spake thusly:
Quoted 8 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]> A few adjustments here and there, plus re-definition of the Crimea timezone.
New definition for the moment the Big-Bang occured, too. :-)
Quoted 7 lines
Quoted 1 line
Signed-off-by "Yann E. MORIN" <[email protected]>While reading lwn.net, I noticed this:
https://bugzilla.gnome.org/show_bug.cgi?id=730332
Have you noticed isses with glib-based programs?
No, the only application I'm currently using that displays a user-facing clock is XBMC, which does not seem to use glib to handle the time.
Quoted 1 line
Do we need to patch glib?
I'll have a look at the two patches proposed in the PR you referenced above.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 7/26 package/zic: bump version for misc fixes
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/zic/zic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/zic/zic.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2013i +ZIC_VERSION = 2014d ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = ftp://ftp.iana.org/tz/releases ZIC_LICENSE = Public domain
Signature · 1 line
1.8.3.2
PATCH 8/26 package/dtv-scan-tables: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
New scan tables, and updates to existing ones.
Update upstream URL at the same time.
--- package/dtv-scan-tables/dtv-scan-tables.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/dtv-scan-tables/dtv-scan-tables.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -DTV_SCAN_TABLES_VERSION = 7809ca1c04e688f35d09b8c1b2ac9b8ef4865322 -DTV_SCAN_TABLES_SITE = http://linuxtv.org/git/dtv-scan-tables.git +DTV_SCAN_TABLES_VERSION = 1246b27f8b45f84c1824925060ad931530542f2e +DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git # This package only contains the transponders data. This is not a 'work'
Signature · 1 line
1.8.3.2
PATCH 9/26 package/tvheadend: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Lotta fixes all over the tree.
Still no new release... :-/
--- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = 6482d33ba90848018c530018e5c38992b8ac921c +TVHEADEND_VERSION = 0ebca1b3dbb6a18d8adcf66a32b5922ce769b9b5 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE
Signature · 1 line
1.8.3.2
PATCH 10/26 package/w_scan: do not line-up variables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/w_scan/w_scan.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
package/w_scan/w_scan.mk +7 -7
@@ -4,15 +4,15 @@ # ################################################################################ -W_SCAN_VERSION = 20130331 -W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 -W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan -W_SCAN_LICENSE = GPLv2+ -W_SCAN_LICENSE_FILES = COPYING +W_SCAN_VERSION = 20130331 +W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 +W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan +W_SCAN_LICENSE = GPLv2+ +W_SCAN_LICENSE_FILES = COPYING ifeq ($(BR2_PACKAGE_LIBICONV),y) -W_SCAN_DEPENDENCIES += libiconv -W_SCAN_CONF_ENV += LIBS=-liconv +W_SCAN_DEPENDENCIES += libiconv +W_SCAN_CONF_ENV += LIBS=-liconv endif $(eval $(autotools-package))
Signature · 1 line
1.8.3.2
PATCH 11/26 package/w_scan: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/w_scan/w_scan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/w_scan/w_scan.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -W_SCAN_VERSION = 20130331 +W_SCAN_VERSION = 20140118 W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan W_SCAN_LICENSE = GPLv2+
Signature · 1 line
1.8.3.2
PATCH 12/26 package/libbsd: do not line-up variables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/libbsd/libbsd.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
package/libbsd/libbsd.mk +4 -4
@@ -4,10 +4,10 @@ # ################################################################################ -LIBBSD_VERSION = 0.4.2 -LIBBSD_SITE = http://libbsd.freedesktop.org/releases -LIBBSD_LICENSE = BSD-3c MIT -LIBBSD_LICENSE_FILES = COPYING +LIBBSD_VERSION = 0.4.2 +LIBBSD_SITE = http://libbsd.freedesktop.org/releases +LIBBSD_LICENSE = BSD-3c MIT +LIBBSD_LICENSE_FILES = COPYING LIBBSD_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.2
PATCH 13/26 package/libbsd: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
... and switch to using .tar.xz as that's all upstream is providing now.
--- package/libbsd/libbsd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
package/libbsd/libbsd.mk +2 -1
@@ -4,7 +4,8 @@ # ################################################################################ -LIBBSD_VERSION = 0.4.2 +LIBBSD_VERSION = 0.6.0 +LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = http://libbsd.freedesktop.org/releases LIBBSD_LICENSE = BSD-3c MIT LIBBSD_LICENSE_FILES = COPYING
Signature · 1 line
1.8.3.2
PATCH 14/26 package/snappy: do not line-up variables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/snappy/snappy.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
package/snappy/snappy.mk +5 -5
@@ -4,10 +4,10 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.1 -SNAPPY_SITE = http://snappy.googlecode.com/files/ -SNAPPY_LICENSE = BSD-3c -SNAPPY_LICENSE_FILES = COPYING -SNAPPY_INSTALL_STAGING = YES +SNAPPY_VERSION = 1.1.1 +SNAPPY_SITE = http://snappy.googlecode.com/files/ +SNAPPY_LICENSE = BSD-3c +SNAPPY_LICENSE_FILES = COPYING +SNAPPY_INSTALL_STAGING = YES $(eval $(autotools-package))
Signature · 1 line
1.8.3.2
PATCH 15/26 package/snappy: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
This is the un-tagged 1.1.2 release.
--- package/snappy/snappy.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/snappy/snappy.mk +2 -2
@@ -4,8 +4,8 @@ # ################################################################################ -SNAPPY_VERSION = 1.1.1 -SNAPPY_SITE = http://snappy.googlecode.com/files/ +SNAPPY_VERSION = 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4 +SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) SNAPPY_LICENSE = BSD-3c SNAPPY_LICENSE_FILES = COPYING SNAPPY_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.2
PATCH 16/26 package/libevdev: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/libevdev/libevdev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libevdev/libevdev.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 0.5 +LIBEVDEV_VERSION = 1.2.1 LIBEVDEV_SITE = http://cgit.freedesktop.org/libevdev/snapshot LIBEVDEV_LICENSE = X11 LIBEVDEV_LICENSE_FILES = COPYING
Signature · 1 line
1.8.3.2
PATCH 17/26 package/procps: bump version and rename to procps-ng
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
procps is getting replaced by procps-ng, and there are new versions available!
procps-ng is now an autotools package, so get rid of our custom build/install rules.
Remove most patches, except for one that still half-applies, so update and rename it.
procps is dead, long live procps-ng!
---
package/Config.in | 2 +-
package/{procps => procps-ng}/Config.in | 0
package/procps-ng/procps-0000-remove-index.patch | 16 +++++++++++++
package/procps-ng/procps.mk | 15 ++++++++++++
package/procps/procps-make-3.82.patch | 23 -------------------
package/procps/procps-remove-flags.patch | 26 ---------------------
package/procps/procps-remove-index.patch | 21 -----------------
package/procps/procps-wchar.patch | 29 ------------------------
package/procps/procps.mk | 25 --------------------
9 files changed, 32 insertions(+), 125 deletions(-)
rename package/{procps => procps-ng}/Config.in (100%)
create mode 100644 package/procps-ng/procps-0000-remove-index.patch
create mode 100644 package/procps-ng/procps.mk
delete mode 100644 package/procps/procps-make-3.82.patch
delete mode 100644 package/procps/procps-remove-flags.patch
delete mode 100644 package/procps/procps-remove-index.patch
delete mode 100644 package/procps/procps-wchar.patch
delete mode 100644 package/procps/procps.mkpackage/Config.in +1 -1
@@ -1105,7 +1105,7 @@ source "package/numactl/Config.in" source "package/nut/Config.in" source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS -source "package/procps/Config.in" +source "package/procps-ng/Config.in" source "package/psmisc/Config.in" endif source "package/quota/Config.in"
package/procps-ng/Config.in renamed from package/procps/Config.in +0 -0
package/procps-ng/procps-0000-remove-index.patch new file +16 -0
@@ -0,0 +1,16 @@ +sysctl: remove use of legacy index() + +[yann.morin.1998 at free.fr: adapt to procps-ng] +Signed-off-by: "Yann E. MORIN" <[email protected]> +diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c +--- procps-v3.3.9.orig/sysctl.c 2013-12-03 12:16:18.000000000 +0100 ++++ procps-v3.3.9/sysctl.c 2014-05-31 00:45:00.869748741 +0200 +@@ -794,7 +794,7 @@ + program_invocation_short_name); + + for ( ; *argv; argv++) { +- if (WriteMode || index(*argv, '=')) ++ if (WriteMode || strchr(*argv, '=')) + ReturnCode += WriteSetting(*argv); + else + ReturnCode += ReadSetting(*argv);
package/procps-ng/procps.mk new file +15 -0
@@ -0,0 +1,15 @@ +################################################################################ +# +# procps +# +################################################################################ + +PROCPS_VERSION = 3.3.9 +PROCPS_SOURCE = procps-ng-$(PROCPS_VERSION).tar.xz +PROCPS_SITE = http://downloads.sourceforge.net/project/procps-ng/Production +PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+ +PROCPS_LICENSE_FILES = COPYING COPYING.LIB + +PROCPS_DEPENDENCIES = ncurses + +$(eval $(autotools-package))
package/procps/procps-make-3.82.patch deleted +0 -23
@@ -1,23 +0,0 @@ -[PATCH] procps: fix build with make 3.82 - -Equivalent to upstream fix: -http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71 - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: procps-3.2.8/Makefile -=================================================================== ---- procps-3.2.8.orig/Makefile -+++ procps-3.2.8/Makefile -@@ -174,7 +174,7 @@ - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) -
package/procps/procps-remove-flags.patch deleted +0 -26
@@ -1,26 +0,0 @@ -diff -u procps-3.2.5/Makefile procps-3.2.5-patched/Makefile ---- procps-3.2.5/Makefile 2005-01-25 22:55:26.000000000 -0600 -+++ procps-3.2.5-patched/Makefile 2007-07-05 23:09:24.251423681 -0500 -@@ -70,9 +70,7 @@ - CURSES := -lncurses - - # Preprocessor flags. --PKG_CPPFLAGS := -D_GNU_SOURCE -I proc --CPPFLAGS := -I/usr/include/ncurses --ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) -+ALL_CPPFLAGS := -D_GNU_SOURCE -I proc - - # Left out -Wconversion due to noise in glibc headers. - # Left out -Wunreachable-code and -Wdisabled-optimization -@@ -91,11 +89,9 @@ - -Wstrict-prototypes -Wmissing-prototypes - # Note that some stuff below is conditional on CFLAGS containing - # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) --CFLAGS := -O2 -s - ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) - - PKG_LDFLAGS := -Wl,-warn-common --LDFLAGS := - ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) - - ############ Add some extra flags if gcc allows
package/procps/procps-remove-index.patch deleted +0 -21
@@ -1,21 +0,0 @@ -diff -ur procps-3.2.5/sysctl.c procps-3.2.5-patched/sysctl.c ---- procps-3.2.5/sysctl.c 2005-01-05 15:00:47.000000000 -0600 -+++ procps-3.2.5-patched/sysctl.c 2006-12-04 19:51:36.272843000 -0600 -@@ -272,7 +272,7 @@ - return 0; - } /* end if */ - -- equals = index(setting, '='); -+ equals = strchr(setting, '='); - - if (!equals) { - fprintf(stderr, ERR_NO_EQUALS, setting); -@@ -498,7 +498,7 @@ - if (NameOnly && Quiet) // nonsense - return Usage(me); - SwitchesAllowed = false; -- if (WriteMode || index(*argv, '=')) -+ if (WriteMode || strchr(*argv, '=')) - ReturnCode = WriteSetting(*argv); - else - ReturnCode = ReadSetting(*argv);
package/procps/procps-wchar.patch deleted +0 -29
@@ -1,29 +0,0 @@ ---- procps-3.2.7/proc/escape.c 2005-01-06 07:50:26.000000000 +1100 -+++ procps-3.2.7.fixed/proc/escape.c 2008-09-09 11:55:57.000000000 +1000 -@@ -15,7 +15,7 @@ - #include "escape.h" - #include "readproc.h" - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - # include <wchar.h> - # include <wctype.h> - # include <stdlib.h> /* MB_CUR_MAX */ -@@ -23,7 +23,7 @@ - # include <langinfo.h> - #endif - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - static int escape_str_utf8(char *restrict dst, const char *restrict src, int bufsize, int *maxcells){ - int my_cells = 0; - int my_bytes = 0; -@@ -123,7 +123,7 @@ - "********************************" - "********************************"; - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - static int utf_init=0; - - if(utf_init==0){
package/procps/procps.mk deleted +0 -25
@@ -1,25 +0,0 @@ -################################################################################ -# -# procps -# -################################################################################ - -PROCPS_VERSION = 3.2.8 -PROCPS_SITE = http://procps.sourceforge.net/ -PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+ -PROCPS_LICENSE_FILES = COPYING COPYING.LIB - -PROCPS_DEPENDENCIES = ncurses - -define PROCPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define PROCPS_INSTALL_TARGET_CMDS - mkdir -p $(addprefix $(TARGET_DIR)/,usr/bin bin sbin) \ - $(addprefix $(TARGET_DIR)/usr/share/man/,man1 man5 man8) - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) lib64=lib install=install \ - ldconfig=true install -endef - -$(eval $(generic-package))
Signature · 1 line
1.8.3.2
PATCH 17/26 package/procps: bump version and rename to procps-ng
Dear Yann E. MORIN,
Quoted 8 lines · Yann E. MORIN
From: "Yann E. MORIN" <[email protected]>
procps is getting replaced by procps-ng, and there are new versions available!
procps-ng is now an autotools package, so get rid of our custom build/install rules.
Quoted 6 lines
Remove most patches, except for one that still half-applies, so update and rename it.
procps is dead, long live procps-ng!
Signed-off-by "Yann E. MORIN" <[email protected]>
Merging this patch would fix
https://bugs.busybox.net/show_bug.cgi?id=6626.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 17/26 package/procps: bump version and rename to procps-ng
In reply to Yann E. MORINAll,
On 2014-06-01 23:03 +0200, Yann E. MORIN spake thusly:
Quoted 4 lines
From: "Yann E. MORIN" <[email protected]>
procps is getting replaced by procps-ng, and there are new versions available!
Gee... I forgot to apply a fix-up patch that renames the variables... Will respin later.
Regards,
Yann E. MORIN.
Quoted 217 lines
package/Config.in +1
-1@@ -1105,7 +1105,7 @@ source "package/numactl/Config.in" source "package/nut/Config.in" source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS -source "package/procps/Config.in" +source "package/procps-ng/Config.in" source "package/psmisc/Config.in" endif source "package/quota/Config.in"package/procps-ng/Config.in renamed from package/procps/Config.in +0
-0package/procps-ng/procps-0000-remove-index.patch new file +16
-0@@ -0,0 +1,16 @@ +sysctl: remove use of legacy index() + +[yann.morin.1998 at free.fr: adapt to procps-ng] +Signed-off-by: "Yann E. MORIN" <[email protected]> +diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c +--- procps-v3.3.9.orig/sysctl.c 2013-12-03 12:16:18.000000000 +0100 ++++ procps-v3.3.9/sysctl.c 2014-05-31 00:45:00.869748741 +0200 +@@ -794,7 +794,7 @@ + program_invocation_short_name); + + for ( ; *argv; argv++) { +- if (WriteMode || index(*argv, '=')) ++ if (WriteMode || strchr(*argv, '=')) + ReturnCode += WriteSetting(*argv); + else + ReturnCode += ReadSetting(*argv);package/procps-ng/procps.mk new file +15
-0@@ -0,0 +1,15 @@ +################################################################################ +# +# procps +# +################################################################################ + +PROCPS_VERSION = 3.3.9 +PROCPS_SOURCE = procps-ng-$(PROCPS_VERSION).tar.xz +PROCPS_SITE = http://downloads.sourceforge.net/project/procps-ng/Production +PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+ +PROCPS_LICENSE_FILES = COPYING COPYING.LIB + +PROCPS_DEPENDENCIES = ncurses + +$(eval $(autotools-package))package/procps/procps-make-3.82.patch deleted +0
-23@@ -1,23 +0,0 @@ -[PATCH] procps: fix build with make 3.82 - -Equivalent to upstream fix: -http://procps.cvs.sourceforge.net/viewvc/procps/procps/Makefile?r1=1.70&r2=1.71 - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: procps-3.2.8/Makefile -=================================================================== ---- procps-3.2.8.orig/Makefile -+++ procps-3.2.8/Makefile -@@ -174,7 +174,7 @@ - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk ps/module.mk - - do_all: $(ALL) -package/procps/procps-remove-flags.patch deleted +0
-26@@ -1,26 +0,0 @@ -diff -u procps-3.2.5/Makefile procps-3.2.5-patched/Makefile ---- procps-3.2.5/Makefile 2005-01-25 22:55:26.000000000 -0600 -+++ procps-3.2.5-patched/Makefile 2007-07-05 23:09:24.251423681 -0500 -@@ -70,9 +70,7 @@ - CURSES := -lncurses - - # Preprocessor flags. --PKG_CPPFLAGS := -D_GNU_SOURCE -I proc --CPPFLAGS := -I/usr/include/ncurses --ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS) -+ALL_CPPFLAGS := -D_GNU_SOURCE -I proc - - # Left out -Wconversion due to noise in glibc headers. - # Left out -Wunreachable-code and -Wdisabled-optimization -@@ -91,11 +89,9 @@ - -Wstrict-prototypes -Wmissing-prototypes - # Note that some stuff below is conditional on CFLAGS containing - # an option that starts with "-g". (-g, -g2, -g3, -ggdb, etc.) --CFLAGS := -O2 -s - ALL_CFLAGS := $(PKG_CFLAGS) $(CFLAGS) - - PKG_LDFLAGS := -Wl,-warn-common --LDFLAGS := - ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) - - ############ Add some extra flags if gcc allowspackage/procps/procps-remove-index.patch deleted +0
-21@@ -1,21 +0,0 @@ -diff -ur procps-3.2.5/sysctl.c procps-3.2.5-patched/sysctl.c ---- procps-3.2.5/sysctl.c 2005-01-05 15:00:47.000000000 -0600 -+++ procps-3.2.5-patched/sysctl.c 2006-12-04 19:51:36.272843000 -0600 -@@ -272,7 +272,7 @@ - return 0; - } /* end if */ - -- equals = index(setting, '='); -+ equals = strchr(setting, '='); - - if (!equals) { - fprintf(stderr, ERR_NO_EQUALS, setting); -@@ -498,7 +498,7 @@ - if (NameOnly && Quiet) // nonsense - return Usage(me); - SwitchesAllowed = false; -- if (WriteMode || index(*argv, '=')) -+ if (WriteMode || strchr(*argv, '=')) - ReturnCode = WriteSetting(*argv); - else - ReturnCode = ReadSetting(*argv);package/procps/procps-wchar.patch deleted +0
-29@@ -1,29 +0,0 @@ ---- procps-3.2.7/proc/escape.c 2005-01-06 07:50:26.000000000 +1100 -+++ procps-3.2.7.fixed/proc/escape.c 2008-09-09 11:55:57.000000000 +1000 -@@ -15,7 +15,7 @@ - #include "escape.h" - #include "readproc.h" - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - # include <wchar.h> - # include <wctype.h> - # include <stdlib.h> /* MB_CUR_MAX */ -@@ -23,7 +23,7 @@ - # include <langinfo.h> - #endif - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - static int escape_str_utf8(char *restrict dst, const char *restrict src, int bufsize, int *maxcells){ - int my_cells = 0; - int my_bytes = 0; -@@ -123,7 +123,7 @@ - "********************************" - "********************************"; - --#if (__GNU_LIBRARY__ >= 6) -+#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - static int utf_init=0; - - if(utf_init==0){package/procps/procps.mk deleted +0
-25@@ -1,25 +0,0 @@ -################################################################################ -# -# procps -# -################################################################################ - -PROCPS_VERSION = 3.2.8 -PROCPS_SITE = http://procps.sourceforge.net/ -PROCPS_LICENSE = GPLv2+, libproc and libps LGPLv2+ -PROCPS_LICENSE_FILES = COPYING COPYING.LIB - -PROCPS_DEPENDENCIES = ncurses - -define PROCPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define PROCPS_INSTALL_TARGET_CMDS - mkdir -p $(addprefix $(TARGET_DIR)/,usr/bin bin sbin) \ - $(addprefix $(TARGET_DIR)/usr/share/man/,man1 man5 man8) - $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) lib64=lib install=install \ - ldconfig=true install -endef - -$(eval $(generic-package))Signature · 1 line
1.8.3.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 18/26 package/wayland: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Bump to the recently-released 1.5.0.
--- package/wayland/wayland.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/wayland/wayland.mk +2 -2
@@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_VERSION = 1.4.0 +WAYLAND_VERSION = 1.5.0 WAYLAND_SITE = http://wayland.freedesktop.org/releases/ WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT
@@ -19,7 +19,7 @@ WAYLAND_CONF_OPT = --disable-scanner # We must provide a specialy-crafted wayland-scanner .pc file # which we vampirise and adapt from the host-wayland copy define WAYLAND_SCANNER_PC - $(INSTALL) -m 0644 -D $(HOST_DIR)/usr/share/pkgconfig/wayland-scanner.pc \ + $(INSTALL) -m 0644 -D $(HOST_DIR)/usr/lib/pkgconfig/wayland-scanner.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/wayland-scanner.pc $(SED) 's:^prefix=.*:prefix=/usr:' \ -e 's:^wayland_scanner=.*:wayland_scanner=$(HOST_DIR)/usr/bin/wayland-scanner:' \
Signature · 1 line
1.8.3.2
PATCH 19/26 package/weston: bump version
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Bump to the recently -released 1.5.0.
Remove existing patches, they are no longer needed:
- weston-0000-compositor-rpi-fix-input-initialization.patch was a back-port of anupstream fix, so no longer needed,
- weston-0003-dont-build-tests.patch no longer applies due to a complete rewrite of Makefile.am, but it seems tests now build fine even without EGL support: there is code in the Makefile.am to explicitly handle that case
Add a new patch from upstream to avoid a use-after-free situation.
So, it's no longer needed to autoreconf.
--- ...0-compositor-rpi-fix-input-initialization.patch | 57 ---------------------- package/weston/weston-0000-safe-foreach.patch | 36 ++++++++++++++ package/weston/weston-0003-dont-build-tests.patch | 17 ------- package/weston/weston.mk | 5 +- 4 files changed, 37 insertions(+), 78 deletions(-) delete mode 100644 package/weston/weston-0000-compositor-rpi-fix-input-initialization.patch create mode 100644 package/weston/weston-0000-safe-foreach.patch delete mode 100644 package/weston/weston-0003-dont-build-tests.patch
package/weston/weston-0000-compositor-rpi-fix-input-initialization.patch deleted +0 -57
@@ -1,57 +0,0 @@ -commit bf539e39c15e9a4ef4479d03c52263a3f020ef4a -Author: Emilio Pozuelo Monfort <[email protected]> -Date: Mon Feb 3 16:57:27 2014 +0100 - - compositor-rpi: Fix input initialization - - The input initialization code assumes the outputs have already - been initialized; thus create the outputs first. This fixes a - segfault upon startup. It is also what the drm and fbdev backends - do. - -diff --git a/src/compositor-rpi.c b/src/compositor-rpi.c -index 399090d..e7c0e0d 100644 ---- a/src/compositor-rpi.c -+++ b/src/compositor-rpi.c -@@ -527,13 +527,6 @@ rpi_compositor_create(struct wl_display *display, int *argc, char *argv[], - weston_log("Dispmanx planes are %s buffered.\n", - compositor->single_buffer ? "single" : "double"); - -- if (udev_input_init(&compositor->input, -- &compositor->base, -- compositor->udev, "seat0") != 0) { -- weston_log("Failed to initialize udev input.\n"); -- goto out_launcher; -- } -- - for (key = KEY_F1; key < KEY_F9; key++) - weston_compositor_add_key_binding(&compositor->base, key, - MODIFIER_CTRL | MODIFIER_ALT, -@@ -549,19 +542,23 @@ rpi_compositor_create(struct wl_display *display, int *argc, char *argv[], - bcm_host_init(); - - if (rpi_renderer_create(&compositor->base, ¶m->renderer) < 0) -- goto out_udev_input; -+ goto out_launcher; - - if (rpi_output_create(compositor, param->output_transform) < 0) - goto out_renderer; - -+ if (udev_input_init(&compositor->input, -+ &compositor->base, -+ compositor->udev, "seat0") != 0) { -+ weston_log("Failed to initialize udev input.\n"); -+ goto out_renderer; -+ } -+ - return &compositor->base; - - out_renderer: - compositor->base.renderer->destroy(&compositor->base); - --out_udev_input: -- udev_input_destroy(&compositor->input); -- - out_launcher: - weston_launcher_destroy(compositor->base.launcher); -
package/weston/weston-0000-safe-foreach.patch new file +36 -0
@@ -0,0 +1,36 @@ +commit a35d028d66cdd83a4a08663231dd2504f1b228f9 +Author: U. Artie Eoff <[email protected]> +Date: Wed May 21 09:20:02 2014 -0700 + + comp-wayland: use safe foreach when destroying outputs + + wl_list_for_each dereference's output to increment the + next iteration of the loop. However, output is free'd + inside the loop resulting in a dereference to free'd + memory. + + Use wl_list_for_each_safe instead, which is designed to + handle this kind of pattern. + + Signed-off-by: U. Artie Eoff <[email protected]> + Reviewed-by: Thierry Reding <[email protected]> + Signed-off-by: Pekka Paalanen <[email protected]> + +Signed-off-by: "Yann E. MORIN" <[email protected]> + +diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c +index a08b71a..76e5396 100644 +--- a/src/compositor-wayland.c ++++ b/src/compositor-wayland.c +@@ -1997,9 +1997,9 @@ err_free: + static void + wayland_compositor_destroy(struct wayland_compositor *c) + { +- struct weston_output *output; ++ struct weston_output *output, *next; + +- wl_list_for_each(output, &c->base.output_list, link) ++ wl_list_for_each_safe(output, next, &c->base.output_list, link) + wayland_output_destroy(output); + + c->base.renderer->destroy(&c->base);
package/weston/weston-0003-dont-build-tests.patch deleted +0 -17
@@ -1,17 +0,0 @@ -Makefile: do not build tests - -Tests are broken if no EGL support is available. - -Reported-by: Peter Korsgaard <[email protected]> -Signed-off-by: "Yann E. MORIN" <[email protected]> -diff -durN weston-1.3.0.orig/Makefile.am weston-1.3.0/Makefile.am ---- weston-1.3.0.orig/Makefile.am 2013-08-20 20:15:19.000000000 +0200 -+++ weston-1.3.0/Makefile.am 2013-10-14 23:08:12.016392097 +0200 -@@ -14,7 +14,6 @@ - clients \ - data \ - protocol \ -- tests \ - $(wcap_subdir) \ - man -
package/weston/weston.mk +1 -4
@@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 1.4.0 +WESTON_VERSION = 1.5.0 WESTON_SITE = http://wayland.freedesktop.org/releases/ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT
@@ -13,9 +13,6 @@ WESTON_LICENSE_FILES = COPYING WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ jpeg mtdev udev cairo -# We're touching Makefile.am -WESTON_AUTORECONF = YES - WESTON_CONF_OPT = \ --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ --disable-egl \
Signature · 1 line
1.8.3.2
PATCH 20/26 package/weston: libxkbcommon is optional
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
It is possible to build weston without libxkbcommon, for example if using an input method that is not an hardware keyboard (e.g. a virtual keyboard, or none at all.)
Make it optional.
--- package/weston/Config.in | 11 ++++++++++- package/weston/weston.mk | 9 ++++++++- 2 files changed, 18 insertions(+), 2 deletions(-)
package/weston/Config.in +10 -1
@@ -5,7 +5,6 @@ comment "weston needs udev and a toolchain w/ threads, headers >= 3.0" config BR2_PACKAGE_WESTON bool "weston" select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBPNG
@@ -29,6 +28,16 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON +config BR2_PACKAGE_WESTON_HW_KBD + bool "enable keyboard support" + default y + select BR2_PACKAGE_LIBXKBCOMMON + help + Say 'y' here if you plan on using a keyboard. + + Only say 'n' if you're going to use a virtual keyboard or any other + input method. + # Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool
package/weston/weston.mk +8 -1
@@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING -WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ +WESTON_DEPENDENCIES = host-pkgconf wayland pixman libpng \ jpeg mtdev udev cairo WESTON_CONF_OPT = \
@@ -25,6 +25,13 @@ WESTON_CONF_OPT = \ --disable-weston-launch \ --disable-colord +ifeq ($(BR2_PACKAGE_WESTON_HW_KBD),y) +WESTON_DEPENDENCIES += libxkbcommon +WESTON_CONF_OPT += --enable-xkbcommon +else +WESTON_CONF_OPT += --disable-xkbcommon +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) WESTON_DEPENDENCIES += libunwind else
Signature · 1 line
1.8.3.2
PATCH 21/26 package/libinput: new package
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/Config.in | 1 + package/libinput/Config.in | 17 +++++++++++++++++ package/libinput/libinput.mk | 19 +++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/libinput/Config.in create mode 100644 package/libinput/libinput.mk
package/Config.in +1 -0
@@ -624,6 +624,7 @@ source "package/libcec/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" source "package/libhid/Config.in" +source "package/libinput/Config.in" source "package/libiqrf/Config.in" source "package/libllcp/Config.in" source "package/libmbim/Config.in"
package/libinput/Config.in new file +17 -0
@@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBINPUT + bool "libinput" + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_LIBEVDEV + select BR2_PACKAGE_MTDEV + help + libinput is a library to handle input devices in Wayland + compositors and to provide a generic X.Org input driver. + It provides device detection, device handling, input device + event processing and abstraction so minimize the amount of + custom input code compositors need to provide the common + set of functionality that users expect. + + http://freedesktop.org/wiki/Software/libinput/ + +comment "libinput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV
package/libinput/libinput.mk new file +19 -0
@@ -0,0 +1,19 @@ +################################################################################ +# +# libinput +# +################################################################################ + +LIBINPUT_VERSION = 0.2.0 +LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz +LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_LICENSE = MIT +LIBINPUT_LICENSE_FILES = COPYING + +LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev +LIBINPUT_INSTALL_STAGING = YES + +# Tests need fork, so just disable them everywhere. +LIBINPUT_CONF_OPT = --disable-tests + +$(eval $(autotools-package))
Signature · 1 line
1.8.3.2
PATCH 22/26 package/weston: add support for libinput
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/weston/weston.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/weston/weston.mk +7 -0
@@ -32,6 +32,13 @@ else WESTON_CONF_OPT += --disable-xkbcommon endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +WESTON_DEPENDENCIES += libinput +WESTON_CONF_OPT += --enable-libinput-backend +else +WESTON_CONF_OPT += --disable-libinput-backend +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) WESTON_DEPENDENCIES += libunwind else
Signature · 1 line
1.8.3.2
PATCH 23/26 package/freerdp: not forcibly depend on X.Org
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
It is possible to build the libfreerdp standalone, without X.Org. Having a libfreerdp will be usefull for the weston RDP compositor.
Re-order the menuconfig, as freerdp is no longer an X-only application.
--- package/Config.in | 2 +- package/freerdp/Config.in | 17 ++++++++++++----- package/freerdp/freerdp.mk | 18 ++++++++++++++---- 3 files changed, 27 insertions(+), 10 deletions(-)
package/Config.in +1 -1
@@ -190,6 +190,7 @@ endif source "package/fb-test-app/Config.in" source "package/fbterm/Config.in" source "package/fbv/Config.in" +source "package/freerdp/Config.in" source "package/imagemagick/Config.in" source "package/linux-fusion/Config.in" source "package/lite/Config.in"
@@ -227,7 +228,6 @@ source "package/alsamixergui/Config.in" source "package/apitrace/Config.in" source "package/docker/Config.in" source "package/feh/Config.in" -source "package/freerdp/Config.in" source "package/gmpc/Config.in" source "package/gob2/Config.in" source "package/gqview/Config.in"
package/freerdp/Config.in +12 -5
@@ -1,14 +1,21 @@ config BR2_PACKAGE_FREERDP bool "freerdp" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_XORG7 help FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license http://www.freerdp.com/ + +if BR2_PACKAGE_FREERDP + +config BR2_PACKAGE_FREERDP_NEEDS_XLIBS + def_bool y + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXCURSOR + +endif
package/freerdp/freerdp.mk +14 -4
@@ -4,13 +4,23 @@ # ################################################################################ -FREERDP_VERSION = 1.0.1 -FREERDP_SITE = https://github.com/downloads/FreeRDP/FreeRDP -FREERDP_DEPENDENCIES = openssl zlib \ - xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor +# Changeset on the stable-1.1 branch +FREERDP_VERSION = 01865f0e284ce34bb5f38842b34dc80f08b58749 +FREERDP_SITE = https://github.com/FreeRDP/FreeRDP +FREERDP_SITE_METHOD = git +FREERDP_DEPENDENCIES = openssl zlib FREERDP_LICENSE = Apache-2.0 FREEDRP_LICENSE_FILES = LICENSE +FREERDP_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y) +FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor +FREERDP_CONF_OPT += -DWITH_X11=ON +else +FREERDP_CONF_OPT += -DWITH_X11=OFF +endif + ifeq ($(BR2_PACKAGE_CUPS),y) FREERDP_CONF_OPT += -DWITH_CUPS=ON FREERDP_DEPENDENCIES += cups
Signature · 1 line
1.8.3.2
PATCH 24/26 pacakge/freerdp: disable building the manpages
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Building the manpages requires xsltproc, which might not be available. Also, who needs the manpages on the target anyway? ;-)
--- package/freerdp/freerdp.mk | 2 ++ 1 file changed, 2 insertions(+)
package/freerdp/freerdp.mk +2 -0
@@ -14,6 +14,8 @@ FREEDRP_LICENSE_FILES = LICENSE FREERDP_INSTALL_STAGING = YES +FREERDP_CONF_OPT = -DWITH_MANPAGES=OFF + ifeq ($(BR2_PACKAGE_FREERDP_NEEDS_XLIBS),y) FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXt xlib_libXext xlib_libXcursor FREERDP_CONF_OPT += -DWITH_X11=ON
Signature · 1 line
1.8.3.2
PATCH 25/26 package/freerdp: add options to enable/disable server and/or client
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Building the client or the server requires an X.Org stack.
Since freerdp can also be used for weston (wayland-based, hence no X.Org stack), we may want to disable the client and server.
Conversely, with on an X.Org stack, we may want to enable either or none if we're just interested in the library.
Add two options, one to enable the server, the other the client.
--- package/freerdp/Config.in | 18 ++++++++++++++++-- package/freerdp/freerdp.mk | 12 ++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-)
package/freerdp/Config.in +16 -2
@@ -6,16 +6,30 @@ config BR2_PACKAGE_FREERDP FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license + This only installs the freerdp library. + http://www.freerdp.com/ if BR2_PACKAGE_FREERDP config BR2_PACKAGE_FREERDP_NEEDS_XLIBS - def_bool y - depends on BR2_PACKAGE_XORG7 + bool select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR +config BR2_PACKAGE_FREERDP_SERVER + bool "build server" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_FREERDP_X_LIBS + +config BR2_PACKAGE_FREERDP_CLIENT + bool "build client" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_FREERDP_X_LIBS + +comment "freerdp server and client needs X.Org" + depends on !BR2_PACKAGE_XORG7 + endif
package/freerdp/freerdp.mk +12 -0
@@ -23,6 +23,18 @@ else FREERDP_CONF_OPT += -DWITH_X11=OFF endif +ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) +FREERDP_CONF_OPT += -DWITH_SERVER=ON -DWITH_SERVER_INTERFACE=ON +else +FREERDP_CONF_OPT += -DWITH_SERVER=OFF -DWITH_SERVER_INTERFACE=OFF +endif + +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT),y) +FREERDP_CONF_OPT += -DWITH_CLIENT=ON -DWITH_CLIENT_INTERFACE=ON +else +FREERDP_CONF_OPT += -DWITH_CLIENT=OFF -DWITH_CLIENT_INTERFACE=OFF +endif + ifeq ($(BR2_PACKAGE_CUPS),y) FREERDP_CONF_OPT += -DWITH_CUPS=ON FREERDP_DEPENDENCIES += cups
Signature · 1 line
1.8.3.2
PATCH 26/26 package/weston: add support for the RDP compositor
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Using the RDP compositor, one can run a headless machine to serve remote clients, using the RDP protocol.
Add an option to enable the rdp-backend.
---
Note: this is mostly in an WIP state. The backend builds and does not crash. But the best I was able to get when connecting to this RDP server, is an empty, completely black client window, in which I could do nothing, not even run a weston-terminal or whatever, even by explicitly asking to run it via the RDP 'shell' command... But it works, as it does not crash. Oh, wait...
Although WIP, sending it to show off what weston is (supposed to be) capable of.
--- package/weston/Config.in | 5 +++++ package/weston/weston.mk | 7 +++++++ 2 files changed, 12 insertions(+)
package/weston/Config.in +5 -0
@@ -45,6 +45,11 @@ config BR2_PACKAGE_WESTON_HAS_COMPOSITOR config BR2_PACKAGE_WESTON_FBDEV bool "fbdev compositor" +config BR2_PACKAGE_WESTON_RDP + bool "RDP compositor" + select BR2_PACKAGE_FREERDP + select BR2_PACKAGE_WESTON_HAS_COMPOSITOR + comment "RPi compositor needs a toolchain w/ C++, largefile, threads" depends on BR2_arm depends on !BR2_INSTALL_LIBSTDCPP || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
package/weston/weston.mk +7 -0
@@ -39,6 +39,13 @@ else WESTON_CONF_OPT += --disable-libinput-backend endif +ifeq ($(BR2_PACKAGE_WESTON_RDP),y) +WESTON_DEPENDENCIES += freerdp +WESTON_CONF_OPT += --enable-rdp-compositor +else +WESTON_CONF_OPT += --disable-rdp-compositor +endif + ifeq ($(BR2_PACKAGE_LIBUNWIND),y) WESTON_DEPENDENCIES += libunwind else
Signature · 1 line
1.8.3.2