Merge pull request #286 from lrusak/upstream-changes

Upstream changes

packages/audio/libogg/package.mk

@@ -31,3 +31,5 @@ PKG_LONGDESC="Libogg contains necessary functionality to create, decode, and wor
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/audio/libsndfile/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="libsndfile"
-PKG_VERSION="1.0.25"
+PKG_VERSION="1.0.26"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mega-nerd.com/libsndfile/"
 PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
+PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
@@ -37,7 +37,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
                            --disable-silent-rules \
                            --disable-sqlite \
                            --enable-alsa \
-                           --enable-external-libs \
+                           --disable-external-libs \
                            --disable-experimental \
                            --disable-test-coverage \
                            --enable-largefile \

packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch

@@ -1,25 +0,0 @@
-diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
---- libsndfile-1.0.25-old/configure.ac	2011-07-13 01:59:57.000000000 -0700
-+++ libsndfile-1.0.25-new/configure.ac	2011-07-13 17:04:14.000000000 -0700
-@@ -18,9 +18,6 @@
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
- AM_SILENT_RULES([yes])
- 
--dnl Add parameters for aclocal
--AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
--
- AC_LANG([C])
- 
- AC_PROG_CC
-diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
---- libsndfile-1.0.25-old/Makefile.am	2011-07-07 02:47:24.000000000 -0700
-+++ libsndfile-1.0.25-new/Makefile.am	2011-07-13 17:04:14.000000000 -0700
-@@ -2,6 +2,8 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
-+ACLOCAL_AMFLAGS = -I M4
-+
- if BUILD_OCTAVE_MOD
- octave_dir = Octave
- endif

packages/audio/libvorbis/package.mk

@@ -33,4 +33,8 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr --disable-oggtest --disable-docs --disable-examples"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
+                           --with-ogg=$SYSROOT_PREFIX/usr \
+                           --disable-oggtest \
+                           --disable-docs \
+                           --disable-examples"

packages/graphics/libdrm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.67"
+PKG_VERSION="2.4.68"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/multimedia/ffmpeg/package.mk

@@ -24,7 +24,7 @@ PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://github.com/xbmc/FFmpeg/archive/release/${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="FFmpeg-release-${PKG_VERSION}"
-PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis libressl speex"
+PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libressl speex"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
@@ -206,7 +206,7 @@ configure_target() {
               --enable-libspeex \
               --disable-libtheora \
               --disable-libvo-amrwbenc \
-              --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis \
+              --disable-libvorbis \
               --disable-libvpx \
               --disable-libx264 \
               --disable-libxavs \

packages/sysutils/fuse/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="fuse"
-PKG_VERSION="2.9.5"
+PKG_VERSION="2.9.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libfuse/libfuse/"
-PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}_${PKG_VERSION//./_}/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/libfuse/libfuse/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"

packages/wayland/libxkbcommon/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libxkbcommon"
-PKG_VERSION="0.6.0"
+PKG_VERSION="0.6.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"