From 69cb937708686f0d70d246217ba37a50e3869c4c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 07:08:47 +0200 Subject: [PATCH 01/19] dhcpcd: update to 6.0.0. --- srcpkgs/dhcpcd/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index c5e82f4989..26175dd896 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,17 +1,17 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=5.6.8 -revision=2 +version=6.0.0 +revision=1 build_style=configure configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/run" -makedepends="which ntp" +hostmakedepends="which ntp" short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="Simplified BSD" homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" -checksum=a3b15da770623774f4e659bf3239fca50f03594207bca3a2ad011f0b68d8eec4 +checksum=174c78016ae7e27e723e4b61f1f6683021c3fe940d575ba7b4722a291b246e9f post_install() { chmod 755 ${DESTDIR}/usr/sbin/dhcpcd From 492076a59e0adbd35039e8bdd5cb4e294937e948 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 07:36:10 +0200 Subject: [PATCH 02/19] ca-certificates: update to 20130610. --- srcpkgs/ca-certificates/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 43d4c2ec68..54ff9110fb 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,6 +1,6 @@ # Template file for 'ca-certificates' pkgname=ca-certificates -version=20130119 +version=20130610 revision=1 makedepends="python openssl run-parts" short_desc="Common CA certificates" @@ -8,7 +8,7 @@ maintainer="Juan RP " homepage="http://packages.qa.debian.org/c/ca-certificates.html" license="GPL-2" distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.gz" -checksum=fb51ec9a2c551838cc1646a0b3c9e6bea5c1bb20ff5d71c542451fac4b191c22 +checksum=9529a9cdfca53dc2ecea96171d8d2ff6ff343843f894af4d446686f02a6c03f2 long_desc=" This package includes PEM files of CA certificates to allow SSL-based applications to check for the authenticity of SSL connections." From e411d0f4a8cc9c80fed14f0ba32f14119720f0d4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 07:36:59 +0200 Subject: [PATCH 03/19] automake: update to 1.14. --- srcpkgs/automake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template index dfbdeab6ba..98c0ce9838 100644 --- a/srcpkgs/automake/template +++ b/srcpkgs/automake/template @@ -1,6 +1,6 @@ # Template build file for 'automake'. pkgname=automake -version=1.13.2 +version=1.14 revision=1 build_style=gnu-configure hostmakedepends="perl autoconf>=2.60" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnu.org/software/automake" distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz" -checksum=80692147333399def4116ac1967e92fea9dd26f28670a36600efc2755648a646 +checksum=e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059 automake_package() { depends="perl autoconf>=2.60" From aac4cbb766e1fcf2e98d7d36f7b9f4d3d1b337ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 07:40:57 +0200 Subject: [PATCH 04/19] xbps-src: bump version for latest bugfix. --- srcpkgs/xbps-src/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template index a66a4cac4e..63efb0f52d 100644 --- a/srcpkgs/xbps-src/template +++ b/srcpkgs/xbps-src/template @@ -1,6 +1,6 @@ # Template file for 'xbps-src' pkgname=xbps-src -version=20130621 +version=20130622 revision=1 build_style=gnu-makefile make_build_args="PREFIX=/usr ETCDIR=/etc/xbps" From db54cf752627f4f05e3ac01dc94612cb0684485f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 07:58:40 +0200 Subject: [PATCH 05/19] libusb-compat: -devel pkg depends on libusb. --- srcpkgs/libusb-compat/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template index 455209e62c..25df98040e 100644 --- a/srcpkgs/libusb-compat/template +++ b/srcpkgs/libusb-compat/template @@ -1,7 +1,7 @@ # Template file for 'libusb-compat' pkgname=libusb-compat version=0.1.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libusbx-devel" @@ -17,12 +17,13 @@ long_desc=" just converts libusb-0.1 calls into their libusb-1.0 equivalents." libusb-compat-devel_package() { - depends="libusb-compat>=${version}" + depends="libusbx-devel libusb-compat>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/bin vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig } } From e8139c1cea45fa31f39ac95f845c47e6a0eb687e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 08:01:02 +0200 Subject: [PATCH 06/19] bluez: update to 5.6. --- srcpkgs/bluez/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 285c380f92..cc19a347b6 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,21 +1,20 @@ # Template file for 'bluez' pkgname=bluez -version=5.5 +version=5.6 revision=1 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pie --enable-threads --enable-library" hostmakedepends="pkg-config flex" -makedepends="libglib-devel libudev-devel>=183 dbus-devel - libusb-compat-devel cups-devel libical-devel readline-devel - systemd-devel" +makedepends="libglib-devel libudev-devel>=183 dbus-devel systemd-devel + libusb-compat-devel>=0.1.5_2 cups-devel libical-devel readline-devel" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " homepage="http://www.bluez.org/" license="GPL-2" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=bd4660639b0d423adafe52d62143a7a816c8f5a94f6efef8aeaa7f0a3f014dc6 +checksum=feef22586e1aac28f61ba22ae836fab7a758501395a532e1a009c50e03de1789 long_desc=" This package contains tools and system daemons for using Bluetooth devices. @@ -25,7 +24,7 @@ long_desc=" libbluetooth_package() { short_desc="Library to use the Bluez Linux Bluetooth Stack" pkg_install() { - vmove "usr/lib/libbluetooth.so*" + vmove "usr/lib/libbluetooth.so.*" } } @@ -35,6 +34,7 @@ libbluetooth-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } From 2c25ef93804f8dbebbf20911f59c6ee9fd2ebb0f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 08:33:03 +0200 Subject: [PATCH 07/19] enca: cross build support. --- srcpkgs/enca/patches/configure_cross.patch | 19 +++++++++++++++++++ srcpkgs/enca/template | 22 ++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/enca/patches/configure_cross.patch diff --git a/srcpkgs/enca/patches/configure_cross.patch b/srcpkgs/enca/patches/configure_cross.patch new file mode 100644 index 0000000000..248015f89f --- /dev/null +++ b/srcpkgs/enca/patches/configure_cross.patch @@ -0,0 +1,19 @@ +--- configure.orig 2013-05-26 17:02:23.033985581 +0200 ++++ configure 2013-05-26 17:03:03.482704657 +0200 +@@ -12896,16 +12896,6 @@ _ACEOF + + fi + +- +-if test "$prefix" = "NONE"; then +- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" +- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" +-else +- LDFLAGS="$LDFLAGS -L$prefix/lib" +- CPPFLAGS="$CPPFLAGS -I$prefix/include" +-fi +- +- + case "$target" in + NONE) yeti_libm_target="$host" ;; + *) yeti_libm_target="$target" ;; diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template index 84a8354e64..dcdc8eb720 100644 --- a/srcpkgs/enca/template +++ b/srcpkgs/enca/template @@ -1,10 +1,13 @@ # Template file for 'enca' pkgname=enca version=1.14 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--enable-external --disable-static" -makedepends="pkg-config recode-devel" +configure_args="--enable-external --disable-static ac_cv_file__dev_random=yes + ac_cv_file__dev_urandom=yes ac_cv_file__dev_srandom=no + ac_cv_file__dev_arandom=no am_cv_func_iconv_works=yes libiconv_ok=yes" +hostmakedepends="pkg-config" +makedepends="recode-devel>=3.6_6" short_desc="Extremely Naive Charset Analyser and converter" maintainer="Juan RP " homepage="http://cihar.com/software/enca/" @@ -12,19 +15,26 @@ license="GPL-2" distfiles="http://dl.cihar.com/enca/enca-${version}.tar.bz2" checksum=7f33e3953fbbdac8ed144b31bbab1bb3bf181150db6ba4cd812fd958ce5f4b58 +pre_build() { + # make_hash must be built for the host. + cd tools + make CC=cc CFLAGS=-Os +} + libenca_package() { - short_desc="${short_desc} - shared library" + short_desc+=" - shared library" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } enca-devel_package() { depends="recode-devel libenca>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gtk-doc } } From 46e91d13d2e92f3ed973572eb142a36427624334 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 09:22:42 +0200 Subject: [PATCH 08/19] pulseaudio: disable gtk3 requirement; unclear what provides and how useful it is. --- srcpkgs/pulseaudio/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 79eaf38c0b..9f1c61c87a 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,14 +1,14 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=4.0 -revision=1 +revision=2 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 --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d - --disable-esound" + --disable-esound --disable-gtk3" hostmakedepends="pkg-config intltool which" -makedepends="zlib-devel gtk+3-devel libltdl-devel speex-devel libXi-devel +makedepends="zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi-devel libXtst-devel xcb-util-devel libsndfile-devel libasyncns-devel dbus-devel tdb-devel libcap-devel avahi-libs-devel openssl-devel libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel @@ -40,9 +40,9 @@ post_install() { libpulseaudio_package() { short_desc+=" - shared libraries" pkg_install() { - vmove "usr/lib/libpulse.so*" - vmove "usr/lib/libpulse-simple.so*" - vmove "usr/lib/libpulse-mainloop-glib.so*" + vmove "usr/lib/libpulse.so.*" + vmove "usr/lib/libpulse-simple.so.*" + vmove "usr/lib/libpulse-mainloop-glib.so.*" vmove usr/lib/pulseaudio } } @@ -55,6 +55,9 @@ pulseaudio-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/cmake + vmove usr/lib/libpulse.so + vmove usr/lib/libpulse-simple.so + vmove usr/lib/libpulse-mainloop-glib.so vmove usr/share/vala } } From e81de1077fcce6563d56225285f0a92fd7ce017d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 09:29:53 +0200 Subject: [PATCH 09/19] ffmpeg: cross build support. --- srcpkgs/ffmpeg/template | 58 ++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index bd8b39a8fd..acc3871f9d 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,7 +1,7 @@ # Template file for 'ffmpeg' pkgname=ffmpeg version=1.0.5 -revision=4 +revision=5 short_desc="Decoding, encoding and streaming software" maintainer="Juan RP " license="GPL-3" @@ -9,24 +9,47 @@ homepage="http://www.ffmpeg.org" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" checksum=1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce -makedepends="pkg-config perl yasm zlib-devel alsa-lib-devel libXfixes-devel +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 libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libcdio-devel - libvpx-devel libva-devel libvdpau-devel librtmp-devel freetype-devel - libmodplug-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel" + libvpx-devel librtmp-devel freetype-devel libmodplug-devel speex-devel + celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel" + +if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + makedepends+=" libva-devel libvdpau-devel " +fi do_configure() { + if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + _args="--enable-vdpau --enable-vaapi" + fi + if [ "$CROSS_BUILD" ]; then + case "$XBPS_TARGET_MACHINE" in + arm*) _arch="arm";; + mips*) _arch="mips";; + i686|x86_64) _arch="$XBPS_TARGET_MACHINE";; + esac + + _args+=" --enable-cross-compile + --sysroot=$XBPS_CROSS_BASE + --cross-prefix=${XBPS_CROSS_TRIPLET}- + --target-os=linux --arch=${_arch}" + + # Remove this pkg_config kludge, breaks cross build. + sed -e 's,$pkg_config --,pkg-config --,g' -i configure + fi + ./configure --prefix=/usr --disable-debug --enable-gpl \ --enable-libcdio --enable-version3 --enable-runtime-cpudetect \ --enable-libmp3lame --enable-libvorbis --enable-libxvid \ --enable-libx264 --enable-libvpx --enable-libtheora \ - --enable-vdpau --enable-vaapi --enable-postproc \ --enable-shared --enable-x11grab --enable-librtmp \ --enable-libpulse --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ --disable-libopencore_amrnb --disable-libopencore_amrwb \ --disable-libschroedinger --disable-libopenjpeg \ - --disable-static + --disable-static --enable-postproc ${_args} } do_build() { @@ -41,56 +64,56 @@ do_install() { libavcodec_package() { short_desc="FFmpeg codec library" pkg_install() { - vmove "usr/lib/libavcodec.so*" + vmove "usr/lib/libavcodec.so.*" } } libavdevice_package() { short_desc="FFmpeg device handling library" pkg_install() { - vmove "usr/lib/libavdevice.so*" + vmove "usr/lib/libavdevice.so.*" } } libavformat_package() { short_desc="FFmpeg file format library" pkg_install() { - vmove "usr/lib/libavformat.so*" + vmove "usr/lib/libavformat.so.*" } } libavutil_package() { short_desc="FFmpeg utility library" pkg_install() { - vmove "usr/lib/libavutil.so*" + vmove "usr/lib/libavutil.so.*" } } libavfilter_package() { short_desc="FFmpeg audio/video filter library" pkg_install() { - vmove "usr/lib/libavfilter.so*" + vmove "usr/lib/libavfilter.so.*" } } libpostproc_package() { short_desc="FFmpeg video postprocessing library" pkg_install() { - vmove "usr/lib/libpostproc.so*" + vmove "usr/lib/libpostproc.so.*" } } libswscale_package() { short_desc="FFmpeg video scaling library" pkg_install() { - vmove "usr/lib/libswscale.so*" + vmove "usr/lib/libswscale.so.*" } } libswresample_package() { short_desc="FFmpeg video resampling library" pkg_install() { - vmove "usr/lib/libswresample.so*" + vmove "usr/lib/libswresample.so.*" } } @@ -98,18 +121,17 @@ ffmpeg-devel_package() { depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version} libavutil>=${version} libavfilter>=${version} libpostproc>=${version} libswscale>=${version} libswresample>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/ffmpeg/examples } } ffmpeg_package() { pkg_install() { - vmove usr/bin - vmove usr/share/man - vmove usr/share/ffmpeg + vmove all } } From 6e5e533d6985edb5fdb53a728e600d640cc6ff47 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 09:36:04 +0200 Subject: [PATCH 10/19] e2fsprogs: update to 1.42.8. --- srcpkgs/e2fsprogs/template | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index b09fcd2ed7..f9e7ee05f2 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -1,13 +1,13 @@ # Template file for 'e2fsprogs' pkgname=e2fsprogs -version=1.42.7 -revision=2 +version=1.42.8 +revision=1 short_desc="Ext2/3/4 Filesystem Utilities" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://e2fsprogs.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz" -checksum=dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 +checksum=b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 build_style=gnu-configure configure_args="--enable-htree --enable-elf-shlibs --disable-fsck @@ -29,17 +29,16 @@ post_install() { rm -f ${DESTDIR}/usr/lib/libuuid* rm -rf ${DESTDIR}/usr/include/uuid rm -f ${DESTDIR}/usr/lib/pkgconfig/uuid* - - # Remove static libs. - rm -f ${DESTDIR}/usr/lib/*.a } e2fsprogs-devel_package() { - depends="libuuid-devel libblkid-devel e2fsprogs-libs>=${version}" - short_desc="${short_desc} -- development files" + depends="libuuid-devel libblkid-devel e2fsprogs-libs-${version}_${revision}" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/bin/compile_et vmove usr/bin/mk_cmds vmove usr/share/man/man1/compile_et.1 @@ -52,16 +51,15 @@ e2fsprogs-devel_package() { } e2fsprogs-libs_package() { - short_desc="${short_desc} -- shared libraries" + short_desc+=" - shared libraries" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } e2fsprogs_package() { conf_files="/etc/mke2fs.conf" pkg_install() { - vmove etc - vmove usr + vmove all } } From 0379e07c4146b83bece492cd37296dd9b84ca286 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 09:58:04 +0200 Subject: [PATCH 11/19] cmus: split plugins to new pkgs; cross build support. --- srcpkgs/cmus-faad | 1 + srcpkgs/cmus-ffmpeg | 1 + srcpkgs/cmus-flac | 1 + srcpkgs/cmus-libao | 1 + srcpkgs/cmus-modplug | 1 + srcpkgs/cmus-mpc | 1 + srcpkgs/cmus-opus | 1 + srcpkgs/cmus-oss | 1 + srcpkgs/cmus-pulseaudio | 1 + srcpkgs/cmus-wavpack | 1 + srcpkgs/cmus/template | 94 ++++++++++++++++++++++++++++++++++++++--- 11 files changed, 98 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/cmus-faad create mode 120000 srcpkgs/cmus-ffmpeg create mode 120000 srcpkgs/cmus-flac create mode 120000 srcpkgs/cmus-libao create mode 120000 srcpkgs/cmus-modplug create mode 120000 srcpkgs/cmus-mpc create mode 120000 srcpkgs/cmus-opus create mode 120000 srcpkgs/cmus-oss create mode 120000 srcpkgs/cmus-pulseaudio create mode 120000 srcpkgs/cmus-wavpack diff --git a/srcpkgs/cmus-faad b/srcpkgs/cmus-faad new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-faad @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-ffmpeg b/srcpkgs/cmus-ffmpeg new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-ffmpeg @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-flac b/srcpkgs/cmus-flac new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-flac @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-libao b/srcpkgs/cmus-libao new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-libao @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-modplug b/srcpkgs/cmus-modplug new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-modplug @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-mpc b/srcpkgs/cmus-mpc new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-mpc @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-opus b/srcpkgs/cmus-opus new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-opus @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-oss b/srcpkgs/cmus-oss new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-oss @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-pulseaudio b/srcpkgs/cmus-pulseaudio new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-pulseaudio @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus-wavpack b/srcpkgs/cmus-wavpack new file mode 120000 index 0000000000..c299fe288c --- /dev/null +++ b/srcpkgs/cmus-wavpack @@ -0,0 +1 @@ +cmus \ No newline at end of file diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 06455aa90a..06b44cf662 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -1,10 +1,8 @@ # Template file for 'cmus' pkgname=cmus version=2.5.0 -revision=2 +revision=3 wrksrc="cmus-v${version}" -build_style=configure -configure_args="prefix=/usr" short_desc="Small, fast and powerful console music player" maintainer="Juan RP " license="GPL-2" @@ -12,13 +10,97 @@ homepage="http://cmus.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cmus/cmus-v${version}.tar.bz2" checksum=2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf -makedepends="pkg-config faad2-devel libflac-devel libao-devel libmad-devel +hostmakedepends="pkg-config" +makedepends="faad2-devel libflac-devel libao-devel libmad-devel libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel ncurses-devel" -cmus_package() { +do_configure() { + ./configure prefix=/usr +} + +do_build() { + make GCC=$CC CC=$CC LD=$CC ${makejobs} +} + +do_install() { + make DESTDIR=$DESTDIR install +} + +cmus-libao_package() { + short_desc+=" - libao output plugin" pkg_install() { - vmove usr + vmove usr/lib/cmus/op/ao.so + } +} + +cmus-faad_package() { + short_desc+=" - AAC/MP4 input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/aac.so + vmove usr/lib/cmus/ip/mp4.so + } +} + +cmus-ffmpeg_package() { + short_desc+=" - FFmpeg input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/ffmpeg.so + } +} + +cmus-flac_package() { + short_desc+=" - FLAC input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/flac.so + } +} + +cmus-mpc_package() { + short_desc+=" - MPC input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/mpc.so + } +} + +cmus-modplug_package() { + short_desc+=" - MOD input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/modplug.so + } +} + +cmus-opus_package() { + short_desc+=" - Opus input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/opus.so + } +} + +cmus-oss_package() { + short_desc+=" - OSS output plugin" + pkg_install() { + vmove usr/lib/cmus/op/oss.so + } +} + +cmus-pulseaudio_package() { + short_desc+=" - Pulseaudio output plugin" + pkg_install() { + vmove usr/lib/cmus/op/pulse.so + } +} + +cmus-wavpack_package() { + short_desc+=" - Wavpack input plugin" + pkg_install() { + vmove usr/lib/cmus/ip/wavpack.so + } +} + +cmus_package() { + pkg_install() { + vmove all } } From 6d1995f3b94a2f190d8968a72f9a116d3f3b7e7b Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 13:53:41 +0200 Subject: [PATCH 12/19] dwm: fix compilation error with Xinerama. --- srcpkgs/dwm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template index 98d947d7f5..4fa968cf39 100644 --- a/srcpkgs/dwm/template +++ b/srcpkgs/dwm/template @@ -21,7 +21,7 @@ do_build() { sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make CC=$CC INCS="-I." LIBS="-lX11" + make CC=$CC INCS="-I." LIBS="-lX11 -lXinerama" } do_install() { From 66615bfe916b8309d36113b61fd90bc49c3ad165 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 16:37:38 +0200 Subject: [PATCH 13/19] slock: new package added 1.1 --- srcpkgs/slock_/template | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/slock_/template diff --git a/srcpkgs/slock_/template b/srcpkgs/slock_/template new file mode 100644 index 0000000000..bedc77bd0c --- /dev/null +++ b/srcpkgs/slock_/template @@ -0,0 +1,29 @@ +# Template file for 'slock' +pkgname=slock +version=1.1 +revision=1 +makedepends="libX11-devel libXext-devel" +short_desc="Simple X display locker" +maintainer="Ypnose " +license="MIT" +homepage="http://tools.suckless.org/slock" +distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" +checksum=e04ae5070c646c78251780d386e14d16fd100367e877dd5cf616dc7aedd0e0e4 + +do_build() { + sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk + sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk + sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk + make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs} +} + +do_install() { + make PREFIX=/usr DESTDIR=$DESTDIR install + vinstall LICENSE 644 usr/share/licenses/$pkgname +} + +slock_package() { + pkg_install() { + vmove usr + } +} From a6984700d17efcae597ec39b705772ba77d3a0c3 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 18:57:35 +0200 Subject: [PATCH 14/19] dev: revbump for previous fix --- srcpkgs/dwm/template | 2 +- srcpkgs/slock_/template | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 srcpkgs/slock_/template diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template index 4fa968cf39..3c17a42563 100644 --- a/srcpkgs/dwm/template +++ b/srcpkgs/dwm/template @@ -1,7 +1,7 @@ # Template file for 'dwm' pkgname=dwm version=6.0 -revision=1 +revision=2 homepage="http://dwm.suckless.org" distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz" makedepends="libX11-devel libXinerama-devel" diff --git a/srcpkgs/slock_/template b/srcpkgs/slock_/template deleted file mode 100644 index bedc77bd0c..0000000000 --- a/srcpkgs/slock_/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'slock' -pkgname=slock -version=1.1 -revision=1 -makedepends="libX11-devel libXext-devel" -short_desc="Simple X display locker" -maintainer="Ypnose " -license="MIT" -homepage="http://tools.suckless.org/slock" -distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" -checksum=e04ae5070c646c78251780d386e14d16fd100367e877dd5cf616dc7aedd0e0e4 - -do_build() { - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk - make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install - vinstall LICENSE 644 usr/share/licenses/$pkgname -} - -slock_package() { - pkg_install() { - vmove usr - } -} From c86402c12aa069571e2d80063dfd86be766fa95f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Jun 2013 18:57:45 +0200 Subject: [PATCH 15/19] xf86-video-intel: update to 2.21.10. --- srcpkgs/xf86-video-intel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 57d8a91e7b..7c3aa1b814 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -1,6 +1,6 @@ # Template build file for 'xf86-video-intel'. pkgname=xf86-video-intel -version=2.21.9 +version=2.21.10 revision=1 build_style=gnu-configure configure_args="--with-default-accel=sna --enable-kms-only --enable-sna" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" -checksum=1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189 +checksum=7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6 only_for_archs="i686 x86_64" From 999c7c1fabd7af60aab89a713c47f11b2e729878 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 23 Jun 2013 06:49:06 +0200 Subject: [PATCH 16/19] libXv: update to 1.0.9. --- srcpkgs/libXv/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template index be531ba15f..d41ebbc61c 100644 --- a/srcpkgs/libXv/template +++ b/srcpkgs/libXv/template @@ -1,6 +1,6 @@ # Template build file for 'libXv'. pkgname=libXv -version=1.0.8 +version=1.0.9 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="MIT" homepage="${XORG_SITE}" distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" -checksum=4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7 +checksum=a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b libXv-devel_package() { depends="xproto videoproto libX11-devel libXext-devel libXv>=${version}" @@ -18,6 +18,7 @@ libXv-devel_package() { pkg_install() { vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/share } From 74c9cd88bf87227ab343e338d6c1fc3dfafdcc42 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 23 Jun 2013 07:11:13 +0200 Subject: [PATCH 17/19] curl: update to 7.31.0. --- srcpkgs/curl/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 45b5513750..3edf8b1908 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template build file for 'curl'. pkgname=curl -version=7.30.0 +version=7.31.0 revision=1 build_style=gnu-configure configure_args="--disable-ldaps --with-gssapi=/usr @@ -13,13 +13,13 @@ maintainer="Juan RP " license="MIT" homepage="http://curl.haxx.se" distfiles="$homepage/download/$pkgname-$version.tar.bz2" -checksum=6b1c410387bea82601baec85d6aa61955794672e36766407e99ade8d55aaaf11 +checksum=a73b118eececff5de25111f35d1d0aafe1e71afdbb83082a8e44d847267e3e08 libcurl_package() { replaces="curl-libs<7.20.1" short_desc="The multiprotocol file transfer library" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } @@ -32,6 +32,7 @@ libcurl-devel_package() { vmove "usr/share/man/man1/curl-config*" vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/share/man/man3 } From 5a701dc7db9f2432303d9672b4ecc223f7cf427e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 23 Jun 2013 07:55:15 +0200 Subject: [PATCH 18/19] gdk-pixbuf: update to 2.28.2. --- srcpkgs/gdk-pixbuf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 5ab593ccf1..1d7ab89b71 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -1,7 +1,7 @@ # Template build file for 'gdk-pixbuf'. pkgname=gdk-pixbuf -version=2.28.1 -revision=3 +version=2.28.2 +revision=1 build_style=gnu-configure configure_args="--without-libjasper --with-included-loaders=png --with-x11" hostmakedepends="perl pkg-config" @@ -12,7 +12,7 @@ maintainer="Juan RP " homepage="http://www.gtk.org/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb +checksum=183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 if [ "$CROSS_BUILD" ]; then # needs glib-mkenums From 00d83d5915aeff4091208f2ccf62d37077f46748 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 23 Jun 2013 08:25:15 +0200 Subject: [PATCH 19/19] New package: snappy-1.1.0. --- common/shlibs | 1 + srcpkgs/snappy-devel | 1 + srcpkgs/snappy/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 120000 srcpkgs/snappy-devel create mode 100644 srcpkgs/snappy/template diff --git a/common/shlibs b/common/shlibs index 79fb5f3baf..3849013961 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1351,3 +1351,4 @@ libkgapi.so.1 libkgapi-2.0.1_1 libkgapi2.so.2 libkgapi-2.0.1_1 libqoauth.so.1 qoauth-1.0.1_1 libIrrlicht.so.1.8 irrlicht-1.8_1 +libsnappy.so.1 snappy-1.1.0_1 diff --git a/srcpkgs/snappy-devel b/srcpkgs/snappy-devel new file mode 120000 index 0000000000..aadd51a496 --- /dev/null +++ b/srcpkgs/snappy-devel @@ -0,0 +1 @@ +snappy \ No newline at end of file diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template new file mode 100644 index 0000000000..af9b725b31 --- /dev/null +++ b/srcpkgs/snappy/template @@ -0,0 +1,28 @@ +# Template file for 'snappy' +pkgname=snappy +version=1.1.0 +revision=1 +build_style=gnu-configure +makedepends="zlib-devel lzo-devel" +short_desc="A fast compressor/decompressor library" +maintainer="Juan RP " +homepage="http://code.google.com/p/snappy/" +license="BSD" +distfiles="http://snappy.googlecode.com/files/snappy-${version}.tar.gz" +checksum=1fa82bc588bb93fa74dfc0e2e9b7d63b6e2a20ede323ef42bf0af0f947676160 + +snappy-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} + +snappy_package() { + pkg_install() { + vmove usr + } +}