From b97a610464ca35fa6ee21e53d561cf91cdbbaca4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 2 Dec 2013 17:51:50 +0100 Subject: [PATCH 01/13] binutils: update to 2.24. --- srcpkgs/binutils/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 9cb49795db4..98517b426c9 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -1,13 +1,13 @@ # Template file for 'binutils' pkgname=binutils -version=2.23.52.0.2 -revision=7 +version=2.24 +revision=1 short_desc="GNU binary utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/binutils/" license="GPL-3" -distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz" -checksum=c2229d5d4067c782b67cfaf7f049acd8361407c0870991bc5430be5c548f6825 +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +checksum=4930b2886309112c00a279483eaef2f0f8e1b1b62010e0239c16b22af7c346d4 bootstrap=yes From f4f00ee84918c3813ab8e94417538c25bbb9021a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 02:00:56 +0100 Subject: [PATCH 02/13] python: make sure to build the sqlite extension (again). --- srcpkgs/python/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 5083633d960..c1d9ce91127 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,7 +1,7 @@ # Template build file for 'python'. pkgname=python version=2.7.6 -revision=2 +revision=3 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language" maintainer="Juan RP " @@ -28,9 +28,9 @@ pre_configure() { } do_configure() { + unset CC LD AR AS RANLIB if [ "$CROSS_BUILD" ]; then - env CC=gcc LD=gcc AR=ar AS=as RANLIB=ranlib \ - CFLAGS=-Os LDFLAGS= ./configure + CFLAGS=-Os LDFLAGS= ./configure make python mkdir hostpython mv python hostpython From 7aa33ff5306b8ccde37b1bf1ee9636e2fa41895d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 02:15:43 +0100 Subject: [PATCH 03/13] bleachbit: update to 1.0. --- srcpkgs/bleachbit/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index 9ebce9d0cb8..1b8b9937410 100644 --- a/srcpkgs/bleachbit/template +++ b/srcpkgs/bleachbit/template @@ -1,16 +1,17 @@ # Template file for 'bleachbit' pkgname=bleachbit -version=0.9.5 -revision=2 +version=1.0 +revision=1 build_style=gnu-makefile make_install_args="prefix=/usr" -hostmakedepends="pygtk>=2 desktop-file-utils gtk-update-icon-cache hicolor-icon-theme" +hostmakedepends="desktop-file-utils gtk-update-icon-cache hicolor-icon-theme" +makedepends="pygtk-devel" short_desc="Deletes unneeded files to free disk space and maintain privacy" maintainer="graysky " license="GPL3" homepage="http://bleachbit.sourceforge.net" distfiles="http://downloads.sourceforge.net/$pkgname/$pkgname-$version.tar.bz2" -checksum=dd8ecded6f078efb0e421c4d43a0481411e28ef6dac6d25653cd8e3cddf196f7 +checksum=1b18c7ae2eadbe6c799159f2cc04f5b99dfbb8d3b87af61fa7ac192a8ce38162 bleachbit_package() { noarch="yes" From 65abe144a4d9c1ab79fa02a8838b09110769f380 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 09:44:08 +0100 Subject: [PATCH 04/13] gimp: update to 2.8.10. --- srcpkgs/gimp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index ca5a3f20589..309a1afbdbf 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,6 +1,6 @@ # Template build file for 'gimp'. pkgname=gimp -version=2.8.8 +version=2.8.10 revision=1 build_style=gnu-configure configure_args="--without-aa --without-gvfs --enable-gimp-console @@ -16,7 +16,7 @@ maintainer="Juan RP " homepage="http://www.gimp.org" license="GPL-3" distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2" -checksum=74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67 +checksum=e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 long_desc=" Powerful image manipulation program similar to Adobe Photoshop[tm]. It supports layers, arbitrary image sizes and working on several images From d501e4a18b476783e3b545815e810f442c6988c9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 09:49:40 +0100 Subject: [PATCH 05/13] gimp: make this build with freetype>=2.5.1. --- srcpkgs/gimp/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 309a1afbdbf..aef667e4ab0 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -23,6 +23,11 @@ long_desc=" at the same time. It comes with a lot of useful plug-ins. Missing is CMYK support and more than 8 bits per channel." +pre_configure() { + # Fix freetype>=2.5.1 build. + sed -e 's,freetype/tttables.h,freetype2/tttables.h,' -i app/text/gimpfont.c +} + gimp-devel_package() { short_desc+=" - development files" pkg_install() { From 69ddc72e70196ff47d8ef7770d956f378d5b56b3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 10:15:10 +0100 Subject: [PATCH 06/13] ngircd: update to 21. --- srcpkgs/ngircd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index b789b720181..d3f5f768d96 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,6 +1,6 @@ # Template build file for 'ngircd' pkgname=ngircd -version=20.3 +version=21 revision=1 build_style=gnu-configure configure_args="--enable-ipv6 --without-ident" @@ -11,7 +11,7 @@ short_desc="Free, portable and lightweight Internet Relay Chat server" maintainer="pancake " license="GPL-2" distfiles="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$version.tar.gz" -checksum=55d7c74c6df790b11a68c07f39836d581965087efb618d3e9a6bec855364c2f9 +checksum=0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0 # Package build options build_options="ssl" From 87e9978739c0f6e75af9588ec101bab80e34646a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 10:53:38 +0100 Subject: [PATCH 07/13] pulseaudio: misc tweaks from Arch. --- srcpkgs/pulseaudio/INSTALL | 20 ++------------------ srcpkgs/pulseaudio/template | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL index 53505c79d2c..a756039f077 100644 --- a/srcpkgs/pulseaudio/INSTALL +++ b/srcpkgs/pulseaudio/INSTALL @@ -3,24 +3,8 @@ post) cat <<_EOF ===================================================================== -To make ALSA use PulseAudio globally in your system you'd have to -create /etc/asound.conf with the following contents: - -pcm.!default { - type pulse -} - -ctl.!default { - type pulse -} - -pcm.pulse { - type pulse -} - -ctl.pulse { - type pulse -} +To make ALSA use PulseAudio globally in your system install the +`alsa-plugins` package. =====================================================================a _EOF diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 3d225d251cc..1d1135dea43 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=4.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc @@ -32,12 +32,24 @@ if [ "$CROSS_BUILD" ]; then fi post_install() { - vinstall ${FILESDIR}/pulseaudio.xinit 755 \ - etc/X11/xinit/xinitrc.d pulseaudio + vinstall ${FILESDIR}/pulseaudio.xinit 755 etc/X11/xinit/xinitrc.d pulseaudio rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf + vmkdir usr/share/bash-completion/completions mv ${DESTDIR}/etc/bash_completion.d/pulseaudio-bash-completion.sh \ ${DESTDIR}/usr/share/bash-completion/completions/pulseaudio + + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' -i ${DESTDIR}/etc/pulse/client.conf + + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) + sed -e '/exit-idle-time/iexit-idle-time=0' -i ${DESTDIR}/etc/pulse/daemon.conf + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i ${DESTDIR}/usr/bin/start-pulseaudio-x11 } libpulseaudio_package() { @@ -51,8 +63,7 @@ libpulseaudio_package() { } pulseaudio-devel_package() { - depends="libasyncns-devel dbus-devel libXtst-devel - libpulseaudio-${version}_${revision}" + depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 8e218212b108e7abd7c1d0b6d1696b15013d3314 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 10:57:51 +0100 Subject: [PATCH 08/13] pulseaudio: drop the INSTALL script completely. --- srcpkgs/pulseaudio/INSTALL | 12 ------------ srcpkgs/pulseaudio/template | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 srcpkgs/pulseaudio/INSTALL diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL deleted file mode 100644 index a756039f077..00000000000 --- a/srcpkgs/pulseaudio/INSTALL +++ /dev/null @@ -1,12 +0,0 @@ -case "${ACTION}" in -post) - cat <<_EOF -===================================================================== - -To make ALSA use PulseAudio globally in your system install the -`alsa-plugins` package. - -=====================================================================a -_EOF - ;; -esac diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 1d1135dea43..a1d642f3dd2 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=4.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc From d7b06c7c2aeb151390e2b467e008ee8d0991b97b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 11:24:27 +0100 Subject: [PATCH 09/13] alsa-plugins: split plugins into -{ffmpeg,jack,pulseaudio,samplerate,speex} pkgs. --- srcpkgs/alsa-plugins-ffmpeg | 1 + srcpkgs/alsa-plugins-jack | 1 + srcpkgs/alsa-plugins-pulseaudio | 1 + srcpkgs/alsa-plugins-samplerate | 1 + srcpkgs/alsa-plugins-speex | 1 + srcpkgs/alsa-plugins/template | 51 +++++++++++++++++++++++++++------ 6 files changed, 47 insertions(+), 9 deletions(-) create mode 120000 srcpkgs/alsa-plugins-ffmpeg create mode 120000 srcpkgs/alsa-plugins-jack create mode 120000 srcpkgs/alsa-plugins-pulseaudio create mode 120000 srcpkgs/alsa-plugins-samplerate create mode 120000 srcpkgs/alsa-plugins-speex diff --git a/srcpkgs/alsa-plugins-ffmpeg b/srcpkgs/alsa-plugins-ffmpeg new file mode 120000 index 00000000000..d675d287d46 --- /dev/null +++ b/srcpkgs/alsa-plugins-ffmpeg @@ -0,0 +1 @@ +alsa-plugins \ No newline at end of file diff --git a/srcpkgs/alsa-plugins-jack b/srcpkgs/alsa-plugins-jack new file mode 120000 index 00000000000..d675d287d46 --- /dev/null +++ b/srcpkgs/alsa-plugins-jack @@ -0,0 +1 @@ +alsa-plugins \ No newline at end of file diff --git a/srcpkgs/alsa-plugins-pulseaudio b/srcpkgs/alsa-plugins-pulseaudio new file mode 120000 index 00000000000..d675d287d46 --- /dev/null +++ b/srcpkgs/alsa-plugins-pulseaudio @@ -0,0 +1 @@ +alsa-plugins \ No newline at end of file diff --git a/srcpkgs/alsa-plugins-samplerate b/srcpkgs/alsa-plugins-samplerate new file mode 120000 index 00000000000..d675d287d46 --- /dev/null +++ b/srcpkgs/alsa-plugins-samplerate @@ -0,0 +1 @@ +alsa-plugins \ No newline at end of file diff --git a/srcpkgs/alsa-plugins-speex b/srcpkgs/alsa-plugins-speex new file mode 120000 index 00000000000..d675d287d46 --- /dev/null +++ b/srcpkgs/alsa-plugins-speex @@ -0,0 +1 @@ +alsa-plugins \ No newline at end of file diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index bf1b7bd4952..661685d32c0 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins version=1.0.27 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-maemo-plugin --with-speex=lib" hostmakedepends="pkg-config" @@ -13,19 +13,52 @@ license="GPL-2, LGPL-2.1" homepage="http://www.alsa-project.org" distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2" checksum=0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 -long_desc=" - The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI - functionality to the Linux operating system. - This package includes some ALSA extra plugins for PulseAudio, Speex, - FFmpeg's libavcodec library and libsamplerate." +alsa-plugins-jack_package() { + replaces="alsa-plugins<1.0.27_3" + short_desc+=" - Jack output plugin" + pkg_install() { + vmove "usr/lib/alsa-lib/*jack*" + } +} -post_install() { - vinstall ${FILESDIR}/asound.conf 644 etc +alsa-plugins-pulseaudio_package() { + replaces="alsa-plugins<1.0.27_3" + short_desc+=" - Pulseaudio output plugin" + conf_files="/etc/asound.conf" + pkg_install() { + vmove "usr/lib/alsa-lib/*pulse*" + vmove "usr/share/alsa/alsa.conf.d/*pulse*" + vinstall ${FILESDIR}/asound.conf 644 etc + } +} + +alsa-plugins-speex_package() { + replaces="alsa-plugins<1.0.27_3" + short_desc+=" - Speex resample plugin" + pkg_install() { + vmove "usr/lib/alsa-lib/*speex*" + } +} + +alsa-plugins-samplerate_package() { + replaces="alsa-plugins<1.0.27_3" + short_desc+=" - libsamplerate resample plugin" + pkg_install() { + vmove "usr/lib/alsa-lib/*samplerate*" + } +} + +alsa-plugins-ffmpeg_package() { + replaces="alsa-plugins<1.0.27_3" + short_desc+=" - libavcodec/a52 plugins" + pkg_install() { + vmove "usr/lib/alsa-lib/*lavc*" + vmove "usr/lib/alsa-lib/*a52*" + } } alsa-plugins_package() { - conf_files="/etc/asound.conf" pkg_install() { vmove all } From e002f48f4a32cdad481b311b544207d78a92205e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 11:26:43 +0100 Subject: [PATCH 10/13] alsa-plugins: make -pulseaudio pkg depend on pulseaudio not just the libs. --- srcpkgs/alsa-plugins/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index 661685d32c0..d80a2d80329 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -1,7 +1,7 @@ # Template build file for 'alsa-plugins'. pkgname=alsa-plugins version=1.0.27 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-maemo-plugin --with-speex=lib" hostmakedepends="pkg-config" @@ -26,6 +26,7 @@ alsa-plugins-pulseaudio_package() { replaces="alsa-plugins<1.0.27_3" short_desc+=" - Pulseaudio output plugin" conf_files="/etc/asound.conf" + depends="pulseaudio" pkg_install() { vmove "usr/lib/alsa-lib/*pulse*" vmove "usr/share/alsa/alsa.conf.d/*pulse*" From 195527b276d03825ae7a4c7604fd582e4c7a697e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 11:34:25 +0100 Subject: [PATCH 11/13] mpv: update to 0.2.4. --- srcpkgs/mpv/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 3536317ef53..01f2f804fc2 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,6 +1,6 @@ # Template file for 'mpv' pkgname=mpv -version=0.2.2 +version=0.2.4 revision=1 short_desc="Video player based on MPlayer/mplayer2" maintainer="Juan RP " @@ -18,8 +18,7 @@ hostmakedepends="which pkg-config python-docutils" makedepends="ffmpeg-devel>=2.1 libass-devel lcms2-devel libXinerama-devel libquvi-devel mpg123-devel libXv-devel libxkbcommon-devel libva-devel libvdpau-devel alsa-lib-devel libbluray-devel libcdio-devel libdvdread-devel pulseaudio-devel MesaLib-devel - harfbuzz-devel libXScrnSaver-devel jack-devel libva-devel desktop-file-utils - hicolor-icon-theme" + harfbuzz-devel libXScrnSaver-devel jack-devel desktop-file-utils hicolor-icon-theme" do_fetch() { git clone -b v${version} git://github.com/mpv-player/mpv.git mpv-${version} From 8ef0eb7097cab579e5811a6b6be4dae640dd16bc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 13:10:55 +0100 Subject: [PATCH 12/13] libpcap: switch libnl3. --- srcpkgs/libpcap/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template index d20126a2bfa..160c0845235 100644 --- a/srcpkgs/libpcap/template +++ b/srcpkgs/libpcap/template @@ -1,11 +1,11 @@ # Template file for 'libpcap' pkgname=libpcap version=1.5.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --with-libnl --with-pcap=linux" hostmakedepends="pkg-config flex" -makedepends="libfl-devel libnl-devel dbus-devel" +makedepends="libfl-devel libnl3-devel dbus-devel" short_desc="System-independent interface for user-level packet capture" maintainer="Juan RP " homepage="http://www.tcpdump.org/" @@ -49,7 +49,7 @@ else fi libpcap-devel_package() { - depends="libnl-devel libpcap>=${version}_${revision}" + depends="libnl3-devel libpcap>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From 38e61b02398bd9b417df88485187b25f432802af Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Dec 2013 13:14:21 +0100 Subject: [PATCH 13/13] libpcap: fix cross build. --- srcpkgs/libpcap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template index 160c0845235..6eb1776691e 100644 --- a/srcpkgs/libpcap/template +++ b/srcpkgs/libpcap/template @@ -4,7 +4,7 @@ version=1.5.1 revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --with-libnl --with-pcap=linux" -hostmakedepends="pkg-config flex" +hostmakedepends="pkg-config flex libnl3-devel" makedepends="libfl-devel libnl3-devel dbus-devel" short_desc="System-independent interface for user-level packet capture" maintainer="Juan RP "