diff --git a/Manual.md b/Manual.md index 11ff5b2c65f..97d6a06b44a 100644 --- a/Manual.md +++ b/Manual.md @@ -645,7 +645,10 @@ arguments can be passed in via `configure_args`. - `gnu-makefile` For packages that use GNU make, build arguments can be passed in via `make_build_args` and install arguments via `make_install_args`. The build target can be overridden via `make_build_target` and the install target -via `make_install_target`. +via `make_install_target`. This build style tries to compensate for makefiles +that do not respect environment variables, so well written makefiles, those +that do such things as append (`+=`) to variables, should have `make_use_env` +set in the body of the template. - `go` For programs written in Go that follow the standard package structure. The variable `go_import_path` must be set to the package's diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh index b328431e55b..123eba57468 100644 --- a/common/build-style/gnu-makefile.sh +++ b/common/build-style/gnu-makefile.sh @@ -4,11 +4,15 @@ do_build() { : ${make_cmd:=make} - ${make_cmd} \ - CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \ - CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - ${makejobs} ${make_build_args} ${make_build_target} + if [ -z "$make_use_env" ]; then + ${make_cmd} \ + CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \ + CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + ${makejobs} ${make_build_args} ${make_build_target} + else + ${make_cmd} ${makejobs} ${make_build_args} ${make_build_target} + fi } do_install() { diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh index 915d06ead79..8c1db5679f5 100644 --- a/common/environment/setup/sourcepkg.sh +++ b/common/environment/setup/sourcepkg.sh @@ -6,7 +6,7 @@ unset -v pkgname version revision short_desc homepage license maintainer unset -v only_for_archs distfiles checksum build_style nocross broken unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_version stackage -unset -v patch_args disable_parallel_build keep_libtool_archives +unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env unset -v reverts subpackages makedepends hostmakedepends depends restricted unset -v nopie build_options build_options_default bootstrap repository reverts unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH diff --git a/srcpkgs/extrace/template b/srcpkgs/extrace/template index 6453a79f003..fa62a4de6d7 100644 --- a/srcpkgs/extrace/template +++ b/srcpkgs/extrace/template @@ -1,16 +1,15 @@ # Template file for 'extrace' pkgname=extrace -version=0.3 +version=0.3.1 revision=1 build_style=gnu-makefile short_desc="Trace exec(2) calls system-wide" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="GPL-2,BSD" homepage="https://github.com/chneukirchen/extrace" distfiles="https://github.com/chneukirchen/extrace/archive/v${version}.tar.gz" -checksum=d76ec065d6e928aa3dfe6ade05a74fe7153010ef732629fb9d72f03a32cb855a +checksum=cb8be256571dae29eaaf45715463c793e19c5dc6df2d3199ecaa61c2ca6c83ed post_install() { - sed '/^$/q' pwait.c >LICENSE vlicense LICENSE } diff --git a/srcpkgs/fbpdf/patches/mupdf-1.10.patch b/srcpkgs/fbpdf/patches/mupdf-1.10.patch deleted file mode 100644 index 298b37f3a79..00000000000 --- a/srcpkgs/fbpdf/patches/mupdf-1.10.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mupdf.c.orig -+++ mupdf.c -@@ -33,10 +33,10 @@ - w = rect.x1 - rect.x0; - h = rect.y1 - rect.y0; - -- pix = fz_new_pixmap_with_bbox(doc->ctx, fz_device_rgb(doc->ctx), &bbox); -+ pix = fz_new_pixmap_with_bbox(doc->ctx, fz_device_rgb(doc->ctx), &bbox, 1); - fz_clear_pixmap_with_value(doc->ctx, pix, 0xff); - -- dev = fz_new_draw_device(doc->ctx, pix); -+ dev = fz_new_draw_device(doc->ctx, NULL, pix); - fz_run_page(doc->ctx, page, dev, &ctm, NULL); - fz_drop_device(doc->ctx, dev); - diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template index 8546e066c05..a421fa60b93 100644 --- a/srcpkgs/fbpdf/template +++ b/srcpkgs/fbpdf/template @@ -1,20 +1,18 @@ # Template file for 'fbpdf' pkgname=fbpdf -version=0.0.20160408 -revision=3 -wrksrc="fbpdf-43ca240" +version=0.0.20161202 +revision=1 +wrksrc="fbpdf-e31a61b" build_style=gnu-makefile -makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel mupdf-devel" +makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel + mupdf-devel" short_desc="Small framebuffer PDF/DJVU viewer" -maintainer="Christian Neukirchen " -license="BSD" +maintainer="Leah Neukirchen " +license="ISC" homepage="http://repo.or.cz/w/fbpdf.git" -distfiles="http://repo.or.cz/fbpdf.git/snapshot/43ca240b0b92a160f724441278e969aef226b31c.tar.gz" -checksum=75ba53a14f132b42ce6020315c0af20293aa8e5327eecf110afadc6f1767c1a2 - -post_extract() { - sed -i 's/lopenjpeg/lopenjp2 -lharfbuzz/g' Makefile -} +distfiles="http://repo.or.cz/fbpdf.git/snapshot/e31a61bb7c00395817fc8b06c907398cf97e73f8.tar.gz" +checksum=4ba342d63e49558a19810fb905b67aa9dee5372c9f223b30fef35c2d6a67802b +LDFLAGS="-lmupdf -lfreetype -lopenjp2 -lharfbuzz -ljbig2dec -lz" do_install() { vbin fbpdf diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 927f67380f4..fdbcf81e98e 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,17 +1,17 @@ # Template file for 'ffmpeg' pkgname=ffmpeg -version=3.2.4 -revision=4 +version=3.3 +revision=1 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" homepage="https://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" -checksum=6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a +checksum=599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel - libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel + libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel libcdio-paranoia-devel librtmp-devel freetype-devel libmodplug-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel @@ -52,7 +52,7 @@ do_configure() { --enable-libcdio --enable-version3 --enable-runtime-cpudetect \ --enable-libmp3lame --enable-libvorbis --enable-libxvid \ --enable-libx264 $(vopt_if vpx --enable-libvpx) --enable-libtheora \ - --enable-shared --enable-static --enable-x11grab \ + --enable-shared --enable-static --enable-libxcb \ --enable-libpulse --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ --enable-libopus --enable-librtmp \ diff --git a/srcpkgs/figlet/template b/srcpkgs/figlet/template index 08ffc70870a..1c206ed8b21 100644 --- a/srcpkgs/figlet/template +++ b/srcpkgs/figlet/template @@ -1,7 +1,7 @@ # Template file for 'figlet' pkgname=figlet version=2.2.5 -revision=3 +revision=5 build_style=gnu-makefile make_install_args="prefix=/usr MANDIR=/usr/share/man" short_desc="Program for making large letters out of ordinary text" diff --git a/srcpkgs/lr/template b/srcpkgs/lr/template index 966353c7e00..1e8e7f5d2bf 100644 --- a/srcpkgs/lr/template +++ b/srcpkgs/lr/template @@ -1,16 +1,15 @@ # Template file for 'lr' pkgname=lr -version=0.3.2 +version=0.4 revision=1 build_style=gnu-makefile short_desc="List files, recursively (a better ls/find/stat/du)" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/chneukirchen/lr" distfiles="https://github.com/chneukirchen/${pkgname}/archive/v${version}.tar.gz" -checksum=c4fb7183c0068708cb57078a83ea3ec254cbebeedcd87650dc39a077aaa88599 +checksum=4fdfa4dbd5757c11e41398d076ded8d4bd87e61bb0a497c423b4625914b63562 post_install() { - head -n26 lr.c >LICENSE vlicense LICENSE } diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 2fcc1e68d77..14c1e7c6c29 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.25.0 -revision=1 +revision=2 build_options="vapoursynth" short_desc="Video player based on MPlayer/mplayer2" maintainer="Juan RP " diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 3e5459d512a..3db32d27426 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,15 +1,15 @@ # Template file for 'neomutt' pkgname=neomutt -version=20170306 -revision=2 +version=20170421 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure -configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --with-gdbm - --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl --enable-notmuch +configure_args="--enable-pop --enable-imap --enable-smtp --with-gdbm + --enable-gpgme --with-idn --with-ssl --with-sasl --enable-notmuch --enable-lua --enable-sidebar --enable-nfs-fix --sysconfdir=/etc/$pkgname" hostmakedepends="automake" makedepends="ncurses-devel gpgme-devel libidn-devel libressl-devel libsasl-devel - gdbm-devel aspell-devel libnotmuch-devel" + gdbm-devel aspell-devel libnotmuch-devel gettext-devel lua-devel" depends="mime-types" conf_files="/etc/$pkgname/Muttrc" short_desc="Mutt with misc fixes and feature patches" @@ -17,7 +17,7 @@ maintainer="Toyam Cox " license="GPL-2" homepage="http://www.neomutt.org" distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz" -checksum=4fc1d02792ca8b6c74105c9376886b0c2fb7ef28bc04be7cfd0f0699aa5c8c63 +checksum=c2033ab18f2b05b45e22475ee98a5decdb2b19934d41803a02b66dd0d452c125 case "${XBPS_TARGET_MACHINE}" in x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";; diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 438fe3350cf..f80cdc904d3 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -33,6 +33,7 @@ desc_option_smartcard="Enable smartcard support" vopt_conflict "sdl" "sdl2" case "$XBPS_TARGET_MACHINE" in + x86_64-musl) broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/2239/steps/shell_3/logs/stdio";; i686*|x86_64*) build_options_default+=" spice";; aarch64-musl) CFLAGS+=" -D_LINUX_SYSINFO_H";; esac