diff --git a/chroot-buildpackages.sh b/chroot-buildpackages.sh index 0719fbbdc6..04c8fe15f5 100644 --- a/chroot-buildpackages.sh +++ b/chroot-buildpackages.sh @@ -115,7 +115,7 @@ chroot_build_packages() # create build script cat <<-EOF > $target_dir/root/build.sh #!/bin/bash - export PATH="/usr/lib/ccache:$PATH" + export PATH="/usr/lib/ccache:\$PATH" export HOME="/root" export DEBIAN_FRONTEND="noninteractive" export DEST="/tmp" @@ -168,7 +168,7 @@ chroot_build_packages() # run build script in chroot systemd-nspawn -a -q -D $target_dir --tmpfs=/root/build --tmpfs=/tmp --bind-ro $SRC/lib/extras-buildpkgs/:/root/overlay \ - --bind-ro $SRC/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" + --bind-ro $SRC/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" 2>&1 | tee -a $DEST/debug/buildpkg.log # move built packages to $DEST/debs/extras/$RELEASE mv $target_dir/root/*.deb $DEST/debs/extra/$RELEASE/ done diff --git a/extras-buildpkgs/09-ffmpeg.conf b/extras-buildpkgs/09-ffmpeg.conf index 8e0f5acb8a..9589a99d10 100644 --- a/extras-buildpkgs/09-ffmpeg.conf +++ b/extras-buildpkgs/09-ffmpeg.conf @@ -4,7 +4,7 @@ local package_name="FFmpeg" local package_repo="https://github.com/FFmpeg/FFmpeg.git" local package_ref="tag:n3.1.1" local package_upstream_version="7:3.1.1" -local package_builddeps="dpkg-dev flite1-dev frei0r-plugins-dev ladspa-sdk libass-dev libavc1394-dev libbluray-dev libbs2b-dev libbz2-dev libcaca-dev libcdio-paranoia-dev libdc1394-22-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libgme-dev libgnutls28-dev libgsm1-dev libiec61883-dev liblzma-dev libmodplug-dev libmp3lame-dev libopenal-dev libopencv-dev libopenjpeg-dev libopus-dev libpulse-dev librtmp-dev libschroedinger-dev libsctp-dev libsdl1.2-dev libshine-dev libsnappy-dev libsoxr-dev libspeex-dev libssh-gcrypt-dev libtheora-dev libtwolame-dev libva-dev libvdpau-dev libvorbis-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx265-dev libxext-dev libxvidcore-dev libxvmc-dev libzmq3-dev libzvbi-dev pkg-config yasm" +local package_builddeps="dpkg-dev flite1-dev frei0r-plugins-dev ladspa-sdk libass-dev libavc1394-dev libbluray-dev libbs2b-dev libbz2-dev libcaca-dev libcdio-paranoia-dev libdc1394-22-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libgme-dev libgnutls28-dev libgsm1-dev libiec61883-dev liblzma-dev libmodplug-dev libmp3lame-dev libopencv-dev libopenjpeg-dev libopus-dev libpulse-dev librtmp-dev libschroedinger-dev libsctp-dev libsdl1.2-dev libshine-dev libsnappy-dev libsoxr-dev libspeex-dev libssh-gcrypt-dev libtheora-dev libtwolame-dev libva-dev libvdpau-dev libvorbis-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx265-dev libxext-dev libxvidcore-dev libxvmc-dev libzmq3-dev libzvbi-dev pkg-config yasm" local package_install_chroot="libavutil-ffmpeg54 libavutil-dev libpostproc-ffmpeg53 libswresample-ffmpeg1 libswscale-ffmpeg3 libswscale-dev libavresample-ffmpeg2 libavresample-dev libavcodec-ffmpeg56 libswresample-dev libavcodec-dev libpostproc-dev libavformat-ffmpeg56 libavformat-dev libavfilter-ffmpeg5 libavfilter-dev libavdevice-ffmpeg56 libavdevice-dev" local package_install_target="libavutil-ffmpeg54 libpostproc-ffmpeg53 libswresample-ffmpeg1 libswscale-ffmpeg3 libavresample-ffmpeg2 libavcodec-ffmpeg56 libavformat-ffmpeg56 libavfilter-ffmpeg5 libavdevice-ffmpeg56 ffmpeg" local package_arch="armhf" diff --git a/extras-buildpkgs/FFmpeg/debian/control b/extras-buildpkgs/FFmpeg/debian/control index 856cdd44e7..9f41523397 100644 --- a/extras-buildpkgs/FFmpeg/debian/control +++ b/extras-buildpkgs/FFmpeg/debian/control @@ -59,8 +59,6 @@ Build-Depends: libmodplug-dev, # --enable-libmp3lame libmp3lame-dev, -# --enable-openal - libopenal-dev, # --enable-libopencv libopencv-dev [!sh4 !sparc64] , # --enable-libopenjpeg diff --git a/extras-buildpkgs/FFmpeg/debian/rules b/extras-buildpkgs/FFmpeg/debian/rules index 524428ff49..89cdeef909 100644 --- a/extras-buildpkgs/FFmpeg/debian/rules +++ b/extras-buildpkgs/FFmpeg/debian/rules @@ -4,6 +4,8 @@ #export DH_VERBOSE=1 #export V=1 +export DEB_CFLAGS_MAINT_APPEND = -Wno-deprecated-declarations + # Determine the debian directory, which is the directory of this makefile. # The path of this makefile is the first word in the MAKEFILE_LIST. DEBIAN_DIR = $(dir $(firstword $(MAKEFILE_LIST))) @@ -22,6 +24,8 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) # Ubuntu ld adds -Bsymbolic-functions by default, but that prevents FFmpeg from building. export DEB_LDFLAGS_MAINT_STRIP=-Wl,-Bsymbolic-functions + + CONFIG := --prefix=/usr \ --extra-version="$(DEB_REVISION)" \ --build-suffix="-ffmpeg" \ @@ -71,8 +75,8 @@ CONFIG := --prefix=/usr \ --enable-libx265 \ --enable-libxvid \ --enable-libzvbi \ - --enable-openal \ --enable-x11grab \ + --disable-openal \ --disable-opengl \ --disable-htmlpages \ --disable-podpages \ @@ -94,17 +98,7 @@ endif ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),) CONFIG += --disable-libx264 --disable-libopencv --disable-frei0r else - CONFIG += --enable-frei0r - - # Some libraries are unusable (#792921) on sparc64. - ifeq (,$(filter $(DEB_HOST_ARCH),sparc64)) - CONFIG += --enable-libx264 - endif - - # OpenCV is not available on some architectures. - ifeq (,$(filter $(DEB_HOST_ARCH),sh4 sparc64)) - CONFIG += --enable-libopencv - endif + CONFIG += --enable-frei0r --enable-libx264 --enable-libopencv endif # Use the default debhelper scripts, where possible. diff --git a/extras-buildpkgs/README.md b/extras-buildpkgs/README.md index cb70363ed9..5f20630637 100644 --- a/extras-buildpkgs/README.md +++ b/extras-buildpkgs/README.md @@ -19,7 +19,7 @@ * Add a code to check if package exists / package needs (re)building - **done** -* Add logging to file for build process +* Add logging to file for build process - **done** ### All packages: @@ -48,3 +48,5 @@ KERNEL=="mali", MODE="0660", GROUP="video" * mpv: disable unused features **done** * libvdpau-sunxi: select branch (master or dev) + +* libcsptr-dev: upgrade to debhelper version 9 diff --git a/extras-buildpkgs/hostapd-realtek/debian/rules b/extras-buildpkgs/hostapd-realtek/debian/rules index e973bc7f5e..38974fcfb4 100644 --- a/extras-buildpkgs/hostapd-realtek/debian/rules +++ b/extras-buildpkgs/hostapd-realtek/debian/rules @@ -13,7 +13,7 @@ export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_APPEN UCFLAGS = -MMD -Wall -g -Os -fPIC BINDIR = /sbin -V = 1 +#V = 1 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -21,7 +21,7 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CC=$(DEB_HOST_GNU_TYPE)-gcc endif -export CC BINDIR V +export CC BINDIR VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\([0-9]*:\)\?\(.*\)$$,\2,p') diff --git a/extras-buildpkgs/hostapd/debian/rules b/extras-buildpkgs/hostapd/debian/rules index 539cb7c72a..25173fed73 100644 --- a/extras-buildpkgs/hostapd/debian/rules +++ b/extras-buildpkgs/hostapd/debian/rules @@ -13,7 +13,7 @@ export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_APPEN UCFLAGS = -MMD -Wall -g -Os -fPIC BINDIR = /sbin -V = 1 +#V = 1 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -21,7 +21,7 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CC=$(DEB_HOST_GNU_TYPE)-gcc endif -export CC BINDIR V +export CC BINDIR VERSION := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\([0-9]*:\)\?\(.*\)$$,\2,p') diff --git a/extras-buildpkgs/libvdpau-sunxi/debian/rules b/extras-buildpkgs/libvdpau-sunxi/debian/rules index 4f6f26fdec..847d913d88 100644 --- a/extras-buildpkgs/libvdpau-sunxi/debian/rules +++ b/extras-buildpkgs/libvdpau-sunxi/debian/rules @@ -2,7 +2,7 @@ PACKAGE = libvdpau-sunxi1 -export DEB_CFLAGS_MAINT_APPEND = -Wall -std=gnu99 +export DEB_CFLAGS_MAINT_APPEND = -Wall -std=gnu99 override_dh_auto_install: dh_auto_install