from:"Ian Leonard"

[OpenWrt-Devel] [PATCH] minidlna: update to 1.1.2

2014-06-02 Thread Ian Leonard

This updates Minidlna to version 1.1.2.

Minidlna has had several changes since 1.0.25:
Renamed minidlna binary to minidlnad (affects the luci plugin) and install to 
/usr/sbin/ per upstream behavior
Adjust for the configure script changing to autoconf
Adjust config file protection
All patches are no logner necessary

Additionally, the presentation page has changed, which breaks part of the 
integration with the luci plugin (reporting how many files are being shared).

Signed-off-by: Ian Leonard antonla...@gmail.com
---
This should have the necessary changes pointed out by the earlier 1.1.0 update 
patch on the mailing list. My thanks to those participants.
---
 multimedia/minidlna/Makefile   | 37 -
 .../minidlna/patches/010-genconfig-checks.patch| 92 --
 .../minidlna/patches/020-makefile-tweaks.patch | 48 ---
 .../minidlna/patches/030-missing-include.patch | 10 ---
 ...-1.0.25-fix-libavformat-api-feature-check.patch | 11 ---
 5 files changed, 15 insertions(+), 183 deletions(-)
 delete mode 100644 multimedia/minidlna/patches/010-genconfig-checks.patch
 delete mode 100644 multimedia/minidlna/patches/020-makefile-tweaks.patch
 delete mode 100644 multimedia/minidlna/patches/030-missing-include.patch
 delete mode 100644 
multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index be9804d..8648205 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2013 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.25
+PKG_VERSION:=1.1.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5
+PKG_MD5SUM:=65cebffa9b57bf30fbfcf2a3a3253e6
 
 PKG_BUILD_PARALLEL:=0
 PKG_BUILD_DEPENDS:=util-linux
 
-include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
@@ -38,7 +37,7 @@ define Package/minidlna/description
 endef
 
 define Package/minidlna/conffiles
-/etc/minidlna.conf
+/etc/config/minidlna
 endef
 
 TARGET_CPPFLAGS += \
@@ -64,28 +63,22 @@ MAKE_FLAGS +=\
LDFLAGS=$(TARGET_LDFLAGS) \
ICONV_LIBS=-liconv $(if $(INTL_FULL),-lintl) \
 
-MAKE_VARS +=\
-   PREFIX=$(STAGING_DIR)/usr \
-   ICONV_PREFIX=$(ICONV_PREFIX) \
-   INTL_PREFIX=$(INTL_PREFIX) \
-   OS_NAME=OpenWrt Linux \
-   OS_VERSION=$(LINUX_VERSION) \
-   OS_URL=http://openwrt.org/; \
-   DB_PATH=/var/run/minidlna \
-   LOG_PATH=/var/log \
-
+CONFIGURE_ARGS +=\
+   --with-libiconv-prefix=$(ICONV_PREFIX) \
+   --with-libintl-prefix=$(INTL_PREFIX) \
+   --with-os-name=OpenWrt Linux \
+   --with-os-version=$(LINUX_VERSION) \
+   --with-os-url=http://openwrt.org/; \
+   --with-db-path=/var/run/minidlna \
+   --with-log-path=/var/log \
 
 define Package/minidlna/install
-   $(INSTALL_DIR) $(1)/usr/bin
-   $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/
+   $(INSTALL_DIR) $(1)/usr/sbin
+   $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlnad $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna
 endef
 
-define Package/minidlna/conffiles
-/etc/config/minidlna
-endef
-
 $(eval $(call BuildPackage,minidlna))
diff --git a/multimedia/minidlna/patches/010-genconfig-checks.patch 
b/multimedia/minidlna/patches/010-genconfig-checks.patch
deleted file mode 100644
index bce8456..000
--- a/multimedia/minidlna/patches/010-genconfig-checks.patch
+++ /dev/null
@@ -1,92 +0,0 @@
 a/genconfig.sh
-+++ b/genconfig.sh
-@@ -23,14 +23,18 @@ RM=rm -f
- CONFIGFILE=config.h
- CONFIGMACRO=__CONFIG_H__
- 
-+PREFIX=${PREFIX:-/usr}
-+ICONV_PREFIX=${ICONV_PREFIX:-$PREFIX}
-+INTL_PREFIX=${INTL_PREFIX:-$PREFIX}
-+
- # Database path
--DB_PATH=/tmp/minidlna
-+DB_PATH=${DB_PATH:-/tmp/minidlna}
- # Log path
--LOG_PATH=${DB_PATH}
-+LOG_PATH=${LOG_PATH:-$DB_PATH}
- 
- # detecting the OS name and version
--OS_NAME=`uname -s`
--OS_VERSION=`uname -r`
-+OS_NAME=${OS_NAME:-$(uname -s)}
-+OS_VERSION=${OS_VERSION:-$(uname -r)}
- TIVO=/*#define TIVO_SUPPORT*/
- NETGEAR=/*#define NETGEAR*/
- READYNAS=/*#define READYNAS*/
-@@ -40,22 +44,22 @@ ${RM} ${CONFIGFILE}
- 
- # Detect if there are missing headers
- # NOTE: This check only works with a normal distro
--[ ! -e /usr/include/sqlite3.h ]  MISSING=libsqlite3 $MISSING
--[ ! -e /usr/include/jpeglib.h ]  MISSING=libjpeg $MISSING
--[ ! -e /usr/include/libexif/exif-loader.h ]  MISSING=libexif

Re: [OpenWrt-Devel] [PATCH] minidlna: update to 1.1.2

2014-06-02 Thread Ian Leonard

On 06/01/2014 11:43 PM, Ian Leonard wrote:
 This updates Minidlna to version 1.1.2.
 
 Minidlna has had several changes since 1.0.25:
 Renamed minidlna binary to minidlnad (affects the luci plugin) and install to 
 /usr/sbin/ per upstream behavior
 Adjust for the configure script changing to autoconf
 Adjust config file protection
 All patches are no logner necessary
 
 Additionally, the presentation page has changed, which breaks part of the 
 integration with the luci plugin (reporting how many files are being shared).
 
 Signed-off-by: Ian Leonard antonla...@gmail.com

Forgot to mention that this was for the [packages] feed; my mistake.

Ian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] dl_cleanup.py: call python2 specifically

2014-05-24 Thread Ian Leonard

dl_cleanup.py is a python2 script. Some distributions, such as Gentoo, have 
moved to python3 as the default python implementation, generating an error.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
 scripts/dl_cleanup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 2d6895e..720c0db 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 # OpenWRT download directory cleanup utility.
 # Delete all but the very last version of the program tarballs.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH][PACKAGES] libexif update to 0.6.21

2014-05-04 Thread Ian Leonard

Update libexif to 0.6.21. Add package licensing information and refresh patch.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
 libs/libexif/Makefile | 9 ++---
 libs/libexif/patches/100-no_doc.patch | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/libexif/Makefile b/libs/libexif/Makefile
index a040f70..5d070fb 100644
--- a/libs/libexif/Makefile
+++ b/libs/libexif/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libexif
-PKG_VERSION:=0.6.19
+PKG_VERSION:=0.6.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/libexif
-PKG_MD5SUM:=56144a030a4c875c600b1ccf713f69f7
+PKG_MD5SUM:=27339b89850f28c8f1c237f233e05b27
+
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=COPYING
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/libs/libexif/patches/100-no_doc.patch 
b/libs/libexif/patches/100-no_doc.patch
index 5ca00ce..1406ace 100644
--- a/libs/libexif/patches/100-no_doc.patch
+++ b/libs/libexif/patches/100-no_doc.patch
@@ -1,11 +1,11 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -280,7 +280,7 @@ target_alias = @target_alias@
+@@ -289,7 +289,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = m4m po libexif test doc binary contrib
 +SUBDIRS = m4m po libexif test binary contrib
- @SHIP_BINARIES_TRUE@README_W32_XDIST = README-Win32.txt
- EXTRA_DIST = @PACKAGE_TARNAME@.spec $(README_W32_XDIST) libexif.pc.in \
+ EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt libexif.pc.in \
libexif-uninstalled.pc.in
+ pkgconfigdir = $(libdir)/pkgconfig
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [packages] ffmpeg: update to 0.11.5

2014-04-18 Thread Ian Leonard

Update ffmpeg to 0.11.5. Drop --disable-optimizations. Per ./configure, 
--disable-optimizations refers to disabling compiler optimizations for 
debugging purposes.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.11.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.11.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=93c1908022567b321df74db7214da6ac
+PKG_MD5SUM:=ea25fc252c132141f12988ed5506bfe8
 
 PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3
 PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3
@@ -292,7 +292,6 @@ FFMPEG_CONFIGURE:= \
--disable-doc \
--disable-dxva2 \
--enable-pthreads \
-   --disable-optimizations \
--enable-small \
--disable-stripping \
--enable-zlib \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Privoxy: version bump 3.0.21

2013-04-21 Thread Ian Leonard

Version bump Privoxy to 3.0.21. Addresses bug #13350.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/net/privoxy/Makefile
===
--- packages/net/privoxy/Makefile   (revision 36354)
+++ packages/net/privoxy/Makefile   (working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
-PKG_VERSION:=3.0.19
-PKG_RELEASE:=2
+PKG_VERSION:=3.0.21
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa
-PKG_MD5SUM:=57acc79059565cc42eda67982842785d
+PKG_MD5SUM:=79558f2545cfcf9731f7de611646d837
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] ffmpeg: include/disable swresample where appropriate

2013-02-28 Thread Ian Leonard

libswresample is an audio resampling library within ffmpeg.

This patch disables swresample in libffmpeg-custom and libffmpeg-mini and adds 
it to libffmpeg-full. Should correct build issue reported in #13089.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/multimedia/ffmpeg/Makefile
===
--- packages/multimedia/ffmpeg/Makefile (revision 35829)
+++ packages/multimedia/ffmpeg/Makefile (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=0.11.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
@@ -311,6 +311,7 @@
--disable-ffserver \
--disable-avfilter \
--disable-postproc \
+   --disable-swresample \
--disable-swscale \
--disable-everything \
$(call 
FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_CUSTOM_ENCODER) \
@@ -336,6 +337,7 @@
--disable-ffserver \
--disable-avfilter \
--disable-postproc \
+   --disable-swresample \
--disable-swscale \
--disable-everything \
$(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \
@@ -372,11 +374,11 @@
 
 define Build/InstallDev/full
$(INSTALL_DIR) $(1)/usr/include
-   $(CP) 
$(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}
 $(1)/usr/include/
+   $(CP) 
$(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}
 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
-   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.{a,so*}
 $(1)/usr/lib/
+   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.{a,so*}
 $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.pc
 $(1)/usr/lib/pkgconfig/
+   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.pc
 $(1)/usr/lib/pkgconfig/
 endef
 
 Build/InstallDev/mini = $(Build/InstallDev/custom)
@@ -421,7 +423,7 @@
 
 define Package/libffmpeg-full/install
$(INSTALL_DIR) $(1)/usr/lib
-   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.so.*
 $(1)/usr/lib/
+   $(CP) 
$(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.so.*
 $(1)/usr/lib/
 endef
 
 Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libvorbis version bump

2013-02-22 Thread Ian Leonard

Update libvorbis to 1.3.3 and switch to the .tar.xz packaging. Drop 
001-automake-compat.patch as it's no longer necessary.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/libs/libvorbis/Makefile
===
--- packages/libs/libvorbis/Makefile(revision 35725)
+++ packages/libs/libvorbis/Makefile(working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2009 OpenWrt.org
+# Copyright (C) 2008-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvorbis
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.3.3
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
-PKG_MD5SUM:=5aa77f55c0e0aab8eb8ed982335daac8
+PKG_MD5SUM:=71b649d3e08e63ece16649df906ce8b9
 
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=COPYING
Index: packages/libs/libvorbis/patches/001-automake-compat.patch
===
--- packages/libs/libvorbis/patches/001-automake-compat.patch   (revision 35725)
+++ packages/libs/libvorbis/patches/001-automake-compat.patch   (working copy)
@@ -1,10 +0,0 @@
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = m4 include vq lib examples test doc
- 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libogg version bump

2013-02-22 Thread Ian Leonard

Update to libogg-1.3.0 and switch to the .tar.xz packaging.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/libs/libogg/Makefile
===
--- packages/libs/libogg/Makefile   (revision 35725)
+++ packages/libs/libogg/Makefile   (working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libogg
-PKG_VERSION:=1.1.4
-PKG_RELEASE:=2
+PKG_VERSION:=1.3.0
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/
-PKG_MD5SUM:=10200ec22543841d9d1c23e0aed4e5e9
+PKG_MD5SUM:=84a35715170f2cd4c77a4448772b95d5
 
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=COPYING
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libpng version bump

2013-02-22 Thread Ian Leonard

Version bump libpng to 1.2.50 and switch to the .tar.xz packaging. Drop patch 
200-CVE-2011-3026.patch as it's integrated.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/libs/libpng/Makefile
===
--- packages/libs/libpng/Makefile   (revision 35725)
+++ packages/libs/libpng/Makefile   (working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libpng
-PKG_VERSION:=1.2.46
-PKG_RELEASE:=2
+PKG_VERSION:=1.2.50
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/libpng
-PKG_MD5SUM:=e8b43dc78ef95b3949af7f961d76874b
+PKG_MD5SUM:=a3e00fccbfe356174ab515b5c00641c7
 
 PKG_LICENSE:=LIBPNG GPLv2
 PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE
Index: packages/libs/libpng/patches/200-CVE-2011-3026.patch
===
--- packages/libs/libpng/patches/200-CVE-2011-3026.patch(revision 35725)
+++ packages/libs/libpng/patches/200-CVE-2011-3026.patch(working copy)
@@ -1,40 +0,0 @@
 a/pngrutil.c
-+++ b/pngrutil.c
-@@ -339,15 +339,18 @@ png_decompress_chunk(png_structp png_ptr
-   /* Now check the limits on this chunk - if the limit fails the
-* compressed data will be removed, the prefix will remain.
-*/
-+  if (prefix_size = (~(png_size_t)0) - 1 ||
-+ expanded_size = (~(png_size_t)0) - 1 - prefix_size
- #ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
--  if (png_ptr-user_chunk_malloc_max 
-+ || (png_ptr-user_chunk_malloc_max 
-   (prefix_size + expanded_size = png_ptr-user_chunk_malloc_max - 1))
- #else
- #  ifdef PNG_USER_CHUNK_MALLOC_MAX
--  if ((PNG_USER_CHUNK_MALLOC_MAX  0) 
-+ || ((PNG_USER_CHUNK_MALLOC_MAX  0) 
-   prefix_size + expanded_size = PNG_USER_CHUNK_MALLOC_MAX - 1)
- #  endif
- #endif
-+  )
-  png_warning(png_ptr, Exceeded size limit while expanding chunk);
- 
-   /* If the size is zero either there was an error and a message
-@@ -355,14 +358,11 @@ png_decompress_chunk(png_structp png_ptr
-* and we have nothing to do - the code will exit through the
-* error case below.
-*/
--#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \
--defined(PNG_USER_CHUNK_MALLOC_MAX)
--  else
--#endif
--  if (expanded_size  0)
-+  else if (expanded_size  0)
-   {
-  /* Success (maybe) - really uncompress the chunk. */
-  png_size_t new_size = 0;
-+
-  png_charp text = png_malloc_warn(png_ptr,
- prefix_size + expanded_size + 1);
- 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libdlna version bump

2013-02-22 Thread Ian Leonard

Update libdlna to 0.2.4.

Drop 100-configure_fix.patch. This was a mix of configure fixes and changes to 
build with newer ffmpeg versions. The ffmpeg changes are integrated. The 
configure changes are rolled into a new patch, 
010-configure-crosscompile.patch, so it will hopefully stay single purpose 
changes.

Rebase 300-ffmpeg_compat.patch.

Note: This is compile tested only.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/libs/libdlna/Makefile
===
--- packages/libs/libdlna/Makefile  (revision 35725)
+++ packages/libs/libdlna/Makefile  (working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdlna
-PKG_VERSION:=0.2.3
+PKG_VERSION:=0.2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://libdlna.geexbox.org/releases/
-PKG_MD5SUM:=2c974f95b711e5fd07f78fc4ebfcca66
+PKG_MD5SUM:=64d7de57aff5a729f2434fc5e69b4ffc
 
+PKG_LICENSE:=LGPLv2.1+
+PKG_LICENSE_FILES:=COPYING
+
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
Index: packages/libs/libdlna/patches/010-configure-crosscompile.patch
===
--- packages/libs/libdlna/patches/010-configure-crosscompile.patch  
(revision 0)
+++ packages/libs/libdlna/patches/010-configure-crosscompile.patch  
(working copy)
@@ -0,0 +1,59 @@
+--- a/configure
 b/configure
+@@ -184,6 +184,19 @@ check_ld(){
+ check_cmd $cc $LDFLAGS $@ -o $TMPE $TMPO $extralibs
+ }
+ 
++check_host_cc(){
++log check_host_cc $@
++cat $TMPC
++log_file $TMPC
++check_cmd $host_cc $host_cflags $@ -c -o $TMPO $TMPC
++}
++
++check_host_ld(){
++log check_host_ld $@
++check_host_cc || return
++check_cmd $host_cc $host_cflags $host_ldflags $@ -o $TMPE $TMPO
++}
++
+ check_exec(){
+ check_ld $@  { enabled cross_compile || $TMPE $logfile 21; }
+ }
+@@ -318,6 +331,7 @@ includedir='$(PREFIX)/include'
+ static=yes
+ shared=yes
+ cc=gcc
++host_cc=gcc
+ ar=ar
+ ranlib=ranlib
+ make=make
+@@ -465,6 +479,10 @@ else
+   [ -n $STRIP ]  strip=$STRIP
+ fi
+ [ -n $MAKE ]  make=$MAKE
++[ -n $HOST_CC ]  host_cc=$HOST_CC
++[ -n $HOST_CFLAGS ]  host_cflags=$HOST_CFLAGS
++[ -n $HOST_LDFLAGS ]  host_ldflags=$HOST_LDFLAGS
++host_cflags=-Isrc $host_cflags
+ 
+ #
+ #   create logging file
+@@ -649,8 +667,7 @@ check_lib libavcodec/avcodec.h avcodec_r
+ #
+ #   version
+ #
+-temp_cflags -Isrc
+-check_ld EOF
++check_host_ld EOF
+ #include stdio.h
+ #include dlna.h
+ int main(){
+@@ -660,7 +677,6 @@ int main(){
+ }
+ EOF
+ VERSION=`$TMPE`
+-restore_flags
+ 
+ 
+ #
Index: packages/libs/libdlna/patches/100-configure_fix.patch
===
--- packages/libs/libdlna/patches/100-configure_fix.patch   (revision 35725)
+++ packages/libs/libdlna/patches/100-configure_fix.patch   (working copy)
@@ -1,120 +0,0 @@
-diff -ruN libdlna-0.2.3.orig/configure libdlna-0.2.3/configure
 libdlna-0.2.3.orig/configure   2007-11-26 21:47:43.0 +0100
-+++ libdlna-0.2.3/configure2008-04-19 21:59:15.0 +0200
-@@ -177,6 +177,19 @@
- check_cmd $cc $LDFLAGS $@ -o $TMPE $TMPO $extralibs
- }
- 
-+check_host_cc(){
-+log check_host_cc $@
-+cat $TMPC
-+log_file $TMPC
-+check_cmd $host_cc $host_cflags $@ -c -o $TMPO $TMPC
-+}
-+
-+check_host_ld(){
-+log check_host_ld $@
-+check_host_cc || return
-+check_cmd $host_cc $host_cflags $host_ldflags $@ -o $TMPE $TMPO
-+}
-+
- check_exec(){
- check_ld $@  { enabled cross_compile || $TMPE $logfile 21; }
- }
-@@ -311,6 +324,7 @@
- static=yes
- shared=yes
- cc=gcc
-+host_cc=gcc
- ar=ar
- ranlib=ranlib
- make=make
-@@ -454,6 +468,11 @@
- fi
- [ -n $MAKE ]  make=$MAKE
- 
-+[ -n $HOST_CC ]  host_cc=$HOST_CC
-+[ -n $HOST_CFLAGS ]  host_cflags=$HOST_CFLAGS
-+[ -n $HOST_LDFLAGS ]  host_ldflags=$HOST_LDFLAGS
-+host_cflags=-Isrc $host_cflags
-+
- #
- #   create logging file
- #
-@@ -610,15 +629,14 @@
- fi
- 
- echolog Checking for libavformat ...
--check_lib ffmpeg/avformat.h av_register_all -lavformat || die Error, can't 
find libavformat !
-+check_lib libavformat/avformat.h av_register_all -lavformat -lavcodec 
-lavutil || die Error, can't find libavformat !
- echolog Checking for libavcodec ...
--check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die Error, 
can't find libavcodec !
-+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die Error, 
can't

[OpenWrt-Devel] [PATCH] Add xz compressed packages to known extensions of dl_cleanup

2013-02-17 Thread Ian Leonard

Add .tar.xz, .txz, and .orig.tar.xz as known extensions to dl_cleanup.py.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: scripts/dl_cleanup.py
===
--- scripts/dl_cleanup.py   (revision 35642)
+++ scripts/dl_cleanup.py   (working copy)
@@ -3,7 +3,8 @@
 # OpenWRT download directory cleanup utility.
 # Delete all but the very last version of the program tarballs.
 #
-# Copyright (c) 2010 Michael Buesch m...@bu3sch.de
+# Copyright (C) 2010 Michael Buesch m...@bu3sch.de
+# Copyright (C) 2013 OpenWrt.org
 
 
 import sys
@@ -75,11 +76,14 @@
 extensions = (
.tar.gz,
.tar.bz2,
+   .tar.xz,
.orig.tar.gz,
.orig.tar.bz2,
+   .orig.tar.xz,
.zip,
.tgz,
.tbz,
+   .txz,
 )
 
 versionRegex = (
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Minidlna version bump: 1.0.25

2013-02-17 Thread Ian Leonard

Version bump minidlna to 1.0.25 and add an additional patch. Patch is accepted 
upstream, but not yet released.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: multimedia/minidlna/Makefile
===
--- multimedia/minidlna/Makefile(revision 35642)
+++ multimedia/minidlna/Makefile(working copy)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2012 OpenWrt.org
+# Copyright (C) 2010-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.24
+PKG_VERSION:=1.0.25
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=be9b4c91e3fcde592dc3f9828098ca0f
+PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5
 
 PKG_BUILD_PARALLEL:=0
 PKG_BUILD_DEPENDS:=util-linux
Index: 
multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
===
--- 
multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
 (revision 0)
+++ 
multimedia/minidlna/patches/040-minidlna-1.0.25-fix-libavformat-api-feature-check.patch
 (working copy)
@@ -0,0 +1,11 @@
+--- a/metadata.c   2012-08-27 23:00:06.997932249 +0100
 b/metadata.c   2012-08-27 23:10:07.716582960 +0100
+@@ -110,7 +110,7 @@ lav_open(AVFormatContext **ctx, const ch
+ static inline void
+ lav_close(AVFormatContext *ctx)
+ {
+-#if LIBAVFORMAT_VERSION_INT = ((5316)+(28)+0)
++#if LIBAVFORMAT_VERSION_INT = ((5316)+(178)+0)
+   avformat_close_input(ctx);
+ #else
+   av_close_input_file(ctx);
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 3/5] [packages] libjpeg-turbo: fix binary names to match what is built

2013-01-19 Thread Ian Leonard

 Signed-off-by: Russell Senior russ...@personaltelco.net
  PKG_NAME:=libjpeg-turbo
  PKG_VERSION:=1.2.1
 -PKG_RELEASE:=1
 +PKG_RELEASE:=2

  define Package/jpeg-tools/install
   $(INSTALL_DIR) $(1)/usr/bin
   $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{c,d}jpeg $(1)/usr/bin/
 - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jpeg{tran,gut} $(1)/usr/bin/
 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jpegtran $(1)/usr/bin/
   $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/{rd,wr}jpgcom $(1)/usr/bin/
 - $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jpgtest $(1)/usr/bin/
 + $(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/jcstest $(1)/usr/bin/

Looks good to me.

-Ian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH 4/5] [packages] minidlna: depend on libjpeg-turbo to avoid confusion about libjpeg version to use

2013-01-18 Thread Ian Leonard

  PKG_NAME:=minidlna
 -  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
 +  DEPENDS:= +libpthread +libexif +libjpeg-turbo +libsqlite3 +libffmpeg \

This will create a potential conflict as libjpeg and libjpeg-turbo would both 
be providing libjpeg.so. Florian wrote he wanted a solution similar to uClibc 
v. eglibc for package dependency selection, but I haven't looked into how that 
logic works yet. The message should be from early December 2012 when 
libjpeg-turbo was merged.

Ian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCHv2] Libjpeg-turbo 1.2.1 Version Bump

2013-01-12 Thread Ian Leonard

The license changed in version 1.2.0 from the wxWindows Library license to the 
3-clause BSD license.

v2: Corrects licensing information in the Makefile.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: libs/libjpeg-turbo/Makefile
===
--- libs/libjpeg-turbo/Makefile (revision 35099)
+++ libs/libjpeg-turbo/Makefile (working copy)
@@ -1,20 +1,23 @@
 # 
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
 #
-# This is free software, licensed under the wxWindows Library Licence, Version 
3.1.
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libjpeg-turbo
-PKG_MD5SUM:=03b9c1406c7bfdc204313c2917ce6962
+PKG_MD5SUM:=f61e60ff01381ece4d2fe65eeb52669e
 
+PKG_LICENSE:=BSD-3c
+PKG_LICENSE_FILES:=README-turbo.txt
+
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCHv3] Libjpeg-turbo 1.2.1 Version Bump

2013-01-12 Thread Ian Leonard

The license changed in version 1.2.0 from the wxWindows Library license to the 
3-clause BSD license.

v2: Corrects licensing information in the Makefile.
v3: Extend Copyright to 2013. The 2011 is from the original package submission 
in Dec. 2011 of libjpeg-turbo to OpenWrt.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: libs/libjpeg-turbo/Makefile
===
--- libs/libjpeg-turbo/Makefile (revision 35099)
+++ libs/libjpeg-turbo/Makefile (working copy)
@@ -1,20 +1,23 @@
 # 
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2011-2013 OpenWrt.org
 #
-# This is free software, licensed under the wxWindows Library Licence, Version 
3.1.
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libjpeg-turbo
-PKG_MD5SUM:=03b9c1406c7bfdc204313c2917ce6962
+PKG_MD5SUM:=f61e60ff01381ece4d2fe65eeb52669e
 
+PKG_LICENSE:=BSD-3c
+PKG_LICENSE_FILES:=README-turbo.txt
+
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Typo correction in description for HFS filesystem kernel module

2012-12-30 Thread Ian Leonard

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: package/kernel/modules/fs.mk
===
--- package/kernel/modules/fs.mk(revision 34879)
+++ package/kernel/modules/fs.mk(working copy)
@@ -121,7 +121,7 @@
 
 define KernelPackage/fs-hfs
   SUBMENU:=$(FS_MENU)
-  TITLE:=HFS+ filesystem support
+  TITLE:=HFS filesystem support
   KCONFIG:=CONFIG_HFS_FS
   FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
   AUTOLOAD:=$(call AutoLoad,30,hfs)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] FFmpeg 0.8.12 Version Bump

2012-12-30 Thread Ian Leonard

Signed-off-by: Ian Leonard antonla...@gmail.com
---
This should also be a candidate for AA 
---
Index: multimedia/ffmpeg/Makefile
===
--- multimedia/ffmpeg/Makefile  (revision 34879)
+++ multimedia/ffmpeg/Makefile  (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.8.7
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=31da4d5610d7138761e23fab8fe3a84d
+PKG_MD5SUM:=c2e5a219e0c845fe11f9dae9c169640f
 
 PKG_LICENSE:=LGPLv2.1+ GPLv2+ LGPLv3
 PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libjpeg-turbo 1.2.1 Version Bump

2012-12-30 Thread Ian Leonard

The license changed in version 1.2.0 from the wxWindows Library license to the 
3-clause BSD.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: libs/libjpeg-turbo/Makefile
===
--- libs/libjpeg-turbo/Makefile (revision 34879)
+++ libs/libjpeg-turbo/Makefile (working copy)
@@ -1,19 +1,19 @@
 # 
-# Copyright (C) 20011 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
 #
-# This is free software, licensed under the wxWindows Library Licence, Version 
3.1.
-# See /LICENSE for more information.
+# This is free software, licensed under the 3-clause BSD license.
+# See /README-turbo.txt for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libjpeg-turbo
-PKG_MD5SUM:=03b9c1406c7bfdc204313c2917ce6962
+PKG_MD5SUM:=f61e60ff01381ece4d2fe65eeb52669e
 
 PKG_BUILD_PARALLEL:=1
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH] FFmpeg 0.8.12 Version Bump

2012-12-30 Thread Ian Leonard

On 12/30/2012 02:45 AM, Luka Perkov wrote:
 On Sun, Dec 30, 2012 at 12:47:15AM -0800, Ian Leonard wrote:
 -PKG_VERSION:=0.8.7
 -PKG_RELEASE:=2
 +PKG_VERSION:=0.8.12
 +PKG_RELEASE:=1
 
 Any reason why it's not upgraded to 0.11.2?
 
 Luka

I don't know if the API changed in the subsequent releases, so I continued on 
the existing branch. This should also make it a drop in update for AA, 
containing only bug and security fixes.

If the API changed, I don't know the state of the package tree in continuing to 
build. I intend on updating it to current stable (1.0.1) in the near future to 
see what breaks, and to see how the size changes.

Ian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Libjpeg-turbo to replace libjpeg

2011-12-11 Thread Ian Leonard

This patch adds libjpeg-turbo 1.1.1 and adjusts all packages depending on 
libjpeg to instead depend on libjpeg-turbo. Packages built against the current 
jpeg-6gb in the tree will need to be rebuilt. If you want a drop-in replacement 
for the current tree, remove the --with-jpeg8 line from the configure section.

Libjpeg-turbo is a fork of jpeg-6b, which includes MMX, SSE and NEON 
acceleration and other performance enhancements. It is meant to be ABI/API 
compatible with the Independent JPEG Group's (IJG) jpeg implementation. Since 
its initial release, it also emulates jpeg 7 or 8, and has been adopted as the 
system jpeg library of Fedora, and an option in Gentoo.

The SIMD acceleration provides a 2-4x speedup. On non-SIMD machines the 
enhancements provides up to a 25% improvement.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
The Makefile disables SIMD support, as I believe the only platform OpenWRT 
supports them might be the Geode. I don't have one to test. Before enabling, an 
assembler will need to be added (nasm?).

I have not checked the size in comparison to the IJG's jpeg or checked the 
performance improvements. Numbers above are as reported by the developer. I 
also have not checked the compatibility with every application I adjusted the 
dependencies for. It does work for me with minidlna and libgd.

Testers welcome. After the New Year, my ability to work on this will be 
severely limited. If there is something extensive, someone else will need to 
invest the time in correcting it.

Does OpenWRT wish to switch libjpeg providers? Is there a better way to replace 
libjpeg?

---
Index: packages/utils/hplip/Makefile
===
--- packages/utils/hplip/Makefile   (revision 29504)
+++ packages/utils/hplip/Makefile   (working copy)
@@ -25,7 +25,7 @@
   CATEGORY:=Utilities
   TITLE:=HP Linux Imaging and Printing
   URL:=http://sourceforge.net/projects/hplip/
-  DEPENDS+=+libjpeg +libtiff +libusb +cups +sane-libs
+  DEPENDS+=+libjpeg-turbo +libtiff +libusb +cups +sane-libs
 endef
 
 define Package/hplip/description
Index: packages/utils/sane-backends/Makefile
===
--- packages/utils/sane-backends/Makefile   (revision 29504)
+++ packages/utils/sane-backends/Makefile   (working copy)
@@ -47,7 +47,7 @@
   $(call Package/sane-backends/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libjpeg +libtiff +libusb
+  DEPENDS:=+libjpeg-turbo +libtiff +libusb
   TITLE+= (libraries)
 endef
 
Index: packages/lang/python-imaging-library/Makefile
===
--- packages/lang/python-imaging-library/Makefile   (revision 29504)
+++ packages/lang/python-imaging-library/Makefile   (working copy)
@@ -27,7 +27,7 @@
   SUBMENU:=Python
   TITLE:=Python Imaging Library (PIL)
   URL:=http://www.pythonware.com/products/pil/
-  DEPENDS:=+python +libfreetype +libjpeg +zlib
+  DEPENDS:=+python +libfreetype +libjpeg-turbo +zlib
 endef
 
 define Package/python-imaging-library/description
Index: packages/net/cups/Makefile
===
--- packages/net/cups/Makefile  (revision 29504)
+++ packages/net/cups/Makefile  (working copy)
@@ -25,7 +25,7 @@
 define Package/cups
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp
+  DEPENDS:=+zlib +libpthread +libpng +libjpeg-turbo +libstdcpp
   TITLE:=Common UNIX Printing System
   URL:=http://www.cups.org/
 endef
Index: packages/net/vnc-reflector/Makefile
===
--- packages/net/vnc-reflector/Makefile (revision 29504)
+++ packages/net/vnc-reflector/Makefile (working copy)
@@ -22,7 +22,7 @@
 define Package/vnc-reflector
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libjpeg +zlib
+  DEPENDS:=+libjpeg-turbo +zlib
   TITLE:=VNC proxy for multiple clients
   URL:=http://sourceforge.net/projects/vnc-reflector
 endef
Index: packages/net/freeswitch/Makefile
===
--- packages/net/freeswitch/Makefile(revision 29504)
+++ packages/net/freeswitch/Makefile(working copy)
@@ -761,7 +761,7 @@
 $(eval $(call BuildPlugin,snmp,Simple Network Management 
Protocol,mod_snmp,,+libnetsnmp))
 $(eval $(call BuildPlugin,snom,SNOM specific features,mod_snom,,))
 $(eval $(call BuildPlugin,sofia,SIP,mod_sofia,,))
-$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,+libjpeg))
+$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,+libjpeg-turbo))
 $(eval $(call BuildPlugin,speex,Speex codec,mod_speex,,))
 $(eval $(call BuildPlugin,spidermonkey,JavaScript,mod_spidermonkey,,@BROKEN)) 
# fails in js
 $(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript 
DB,mod_spidermonkey_core_db,,@BROKEN))
Index: packages/libs/tiff/Makefile

[OpenWrt-Devel] [PATCH-v2] Libjpeg-turbo to replace libjpeg

2011-12-11 Thread Ian Leonard

On 12/11/2011 05:07 PM, Ian Leonard wrote:
 This patch adds libjpeg-turbo 1.1.1 and adjusts all packages depending on 
 libjpeg to instead depend on libjpeg-turbo. Packages built against the 
 current jpeg-6gb in the tree will need to be rebuilt. If you want a drop-in 
 replacement for the current tree, remove the --with-jpeg8 line from the 
 configure section.
 
 Libjpeg-turbo is a fork of jpeg-6b, which includes MMX, SSE and NEON 
 acceleration and other performance enhancements. It is meant to be ABI/API 
 compatible with the Independent JPEG Group's (IJG) jpeg implementation. Since 
 its initial release, it also emulates jpeg 7 or 8, and has been adopted as 
 the system jpeg library of Fedora, and an option in Gentoo.
 
 The SIMD acceleration provides a 2-4x speedup. On non-SIMD machines the 
 enhancements provides up to a 25% improvement.
 
 Signed-off-by: Ian Leonard antonla...@gmail.com
 ---
 The Makefile disables SIMD support, as I believe the only platform OpenWRT 
 supports them might be the Geode. I don't have one to test. Before enabling, 
 an assembler will need to be added (nasm?).
 
 I have not checked the size in comparison to the IJG's jpeg or checked the 
 performance improvements. Numbers above are as reported by the developer. I 
 also have not checked the compatibility with every application I adjusted the 
 dependencies for. It does work for me with minidlna and libgd.
 
 Testers welcome. After the New Year, my ability to work on this will be 
 severely limited. If there is something extensive, someone else will need to 
 invest the time in correcting it.
 
 Does OpenWRT wish to switch libjpeg providers? Is there a better way to 
 replace libjpeg?
 
---
An unrelated change to FFmpeg was in the previous patch. Corrected one here.

---
Index: packages/utils/hplip/Makefile
===
--- packages/utils/hplip/Makefile   (revision 29504)
+++ packages/utils/hplip/Makefile   (working copy)
@@ -25,7 +25,7 @@
   CATEGORY:=Utilities
   TITLE:=HP Linux Imaging and Printing
   URL:=http://sourceforge.net/projects/hplip/
-  DEPENDS+=+libjpeg +libtiff +libusb +cups +sane-libs
+  DEPENDS+=+libjpeg-turbo +libtiff +libusb +cups +sane-libs
 endef
 
 define Package/hplip/description
Index: packages/utils/sane-backends/Makefile
===
--- packages/utils/sane-backends/Makefile   (revision 29504)
+++ packages/utils/sane-backends/Makefile   (working copy)
@@ -47,7 +47,7 @@
   $(call Package/sane-backends/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libjpeg +libtiff +libusb
+  DEPENDS:=+libjpeg-turbo +libtiff +libusb
   TITLE+= (libraries)
 endef
 
Index: packages/lang/python-imaging-library/Makefile
===
--- packages/lang/python-imaging-library/Makefile   (revision 29504)
+++ packages/lang/python-imaging-library/Makefile   (working copy)
@@ -27,7 +27,7 @@
   SUBMENU:=Python
   TITLE:=Python Imaging Library (PIL)
   URL:=http://www.pythonware.com/products/pil/
-  DEPENDS:=+python +libfreetype +libjpeg +zlib
+  DEPENDS:=+python +libfreetype +libjpeg-turbo +zlib
 endef
 
 define Package/python-imaging-library/description
Index: packages/net/cups/Makefile
===
--- packages/net/cups/Makefile  (revision 29504)
+++ packages/net/cups/Makefile  (working copy)
@@ -25,7 +25,7 @@
 define Package/cups
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+zlib +libpthread +libpng +libjpeg +libstdcpp
+  DEPENDS:=+zlib +libpthread +libpng +libjpeg-turbo +libstdcpp
   TITLE:=Common UNIX Printing System
   URL:=http://www.cups.org/
 endef
Index: packages/net/vnc-reflector/Makefile
===
--- packages/net/vnc-reflector/Makefile (revision 29504)
+++ packages/net/vnc-reflector/Makefile (working copy)
@@ -22,7 +22,7 @@
 define Package/vnc-reflector
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libjpeg +zlib
+  DEPENDS:=+libjpeg-turbo +zlib
   TITLE:=VNC proxy for multiple clients
   URL:=http://sourceforge.net/projects/vnc-reflector
 endef
Index: packages/net/freeswitch/Makefile
===
--- packages/net/freeswitch/Makefile(revision 29504)
+++ packages/net/freeswitch/Makefile(working copy)
@@ -761,7 +761,7 @@
 $(eval $(call BuildPlugin,snmp,Simple Network Management 
Protocol,mod_snmp,,+libnetsnmp))
 $(eval $(call BuildPlugin,snom,SNOM specific features,mod_snom,,))
 $(eval $(call BuildPlugin,sofia,SIP,mod_sofia,,))
-$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,+libjpeg))
+$(eval $(call BuildPlugin,spandsp,Span DSP,mod_spandsp,,+libjpeg-turbo))
 $(eval $(call BuildPlugin,speex,Speex codec,mod_speex,,))
 $(eval $(call BuildPlugin,spidermonkey,JavaScript,mod_spidermonkey,,@BROKEN)) 
# fails in js
 $(eval $(call

[OpenWrt-Devel] [PATCH] Version Bump Minidlna 1.0.22

2011-10-24 Thread Ian Leonard

This patch updates Minidlna to 1.0.22.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: multimedia/minidlna/Makefile
===
--- multimedia/minidlna/Makefile(revision 28546)
+++ multimedia/minidlna/Makefile(working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.21
+PKG_VERSION:=1.0.22
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=a53e0008ad225843a1782e4af6e5bf0b
+PKG_MD5SUM:=3de2f6b54f43bb998dfad3c8fa75cef3
 
 PKG_BUILD_PARALLEL:=0
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version Bump FFmpeg 0.8.5

2011-10-24 Thread Ian Leonard

This patch updates FFmpeg to 0.8.5.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: multimedia/ffmpeg/Makefile
===
--- multimedia/ffmpeg/Makefile  (revision 28546)
+++ multimedia/ffmpeg/Makefile  (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.8.2
-PKG_RELEASE:=4
+PKG_VERSION:=0.8.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=967d481c98161582d149aced6e3b2f31
+PKG_MD5SUM:=726877b19ece7ea64def8b7e6727e182
 
 FFMPEG_CUSTOM_ENCODERS:= \
ac3 \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Allow for more configurable FFmpeg build options (#7837, #8465)

2011-08-27 Thread Ian Leonard

This patch allows broad control over FFmpeg's libav* build configuration and 
fixes a typo in ffprobe's install section.

The patch resolves #7837 as the choice of building a full libav* is available. 
This should also resolve #8465 as input devices such as cameras can be enabled.

The files created by a full libav* build will be large (several megabytes) and 
not recommended for end users. Its use could help debugging other issues to 
learn whether the problem is the openwrt build configuration or another cause.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: packages/multimedia/ffmpeg/Config.in
===
--- packages/multimedia/ffmpeg/Config.in(revision 28090)
+++ packages/multimedia/ffmpeg/Config.in(working copy)
@@ -1,18 +1,60 @@
 menu Configuration
depends PACKAGE_libffmpeg
 
-config FFMPEG_ENCODE
-   bool Big Toggle for FFmpeg's encoder/muxer support
+comment Libav* build options ---
+
+config FFMPEG_LIBAV_FULL
+   bool Toggle for full libav* support
+   select FFMPEG_BSFS
+   select FFMPEG_DECODE
+   select FFMPEG_ENCODE
+   select FFMPEG_FILTERS
+   select FFMPEG_INDEVS
+   select FFMPEG_OUTDEVS
+   select FFMPEG_HWACCELS
+   select FFMPEG_PARSERS
+   select FFMPEG_PROTOCOLS
depends FFMPEG_PATENTED
+   help
+ This options selects each of the FFmpeg's toggles to create a full 
build
+ of the libav* libraries. Note: This is a large binary and not suitable
+ for most users.
 
+config FFMPEG_BSFS
+   bool Toggle for FFmpeg's bitstream filter support
+
 config FFMPEG_DECODE
-   bool Big Toggle for FFmpeg's decoder/demuxer support
+   bool Toggle for FFmpeg's decoder/demuxer support
depends FFMPEG_PATENTED
 
+config FFMPEG_ENCODE
+   bool Toggle for FFmpeg's encoder/muxer support
+   depends FFMPEG_PATENTED
+
+config FFMPEG_FILTERS
+   bool Toggle for FFmpeg's video processing filter support
+
+config FFMPEG_INDEVS
+   bool Toggle for FFmpeg's input device (camera, etc) support
+
+config FFMPEG_OUTDEVS
+   bool Toggle for FFmpeg's output device support
+
+config FFMPEG_HWACCELS
+   bool Toggle for FFmpeg's video hardware acceleration support
+
+config FFMPEG_PARSERS
+   bool Toggle for FFmpeg's stream parsing support
+
+config FFMPEG_PROTOCOLS
+   bool Toggle for FFmpeg's protocol support
+
 config FFMPEG_PATENTED
bool Include patented codecs and technologies
default BUILD_PATENTED
 
+comment Package Profiles ---
+
 config FFMPEG_FFSERVER_SUPPORT
bool Include support for ffserver (FFmpeg streaming server)
select FFMPEG_MUXER_ffm
Index: packages/multimedia/ffmpeg/Makefile
===
--- packages/multimedia/ffmpeg/Makefile (revision 28090)
+++ packages/multimedia/ffmpeg/Makefile (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=0.8.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
@@ -239,12 +239,13 @@
--enable-postproc \
--enable-swscale \
\
-   --disable-bsfs \
-   --disable-devices \
-   --disable-filters \
-   --disable-hwaccels \
-   --disable-parsers \
-   --disable-protocols \
+   $(if $(CONFIG_FFMPEG_BSFS),,--disable-bsfs) \
+   $(if $(CONFIG_FFMPEG_OUTDEVS),,--disable-outdevs) \
+   $(if $(CONFIG_FFMPEG_INDEVS),,--disable-indevs) \
+   $(if $(CONFIG_FFMPEG_FILTERS),,--disable-filters) \
+   $(if $(CONFIG_FFMPEG_HWACCELS),,--disable-hwaccels) \
+   $(if $(CONFIG_FFMPEG_PARSERS),,--disable-parsers) \
+   $(if $(CONFIG_FFMPEG_PROTOCOLS),,--disable-protocols) \
$(if $(CONFIG_FFMPEG_ENCODE),,--disable-encoders 
--disable-muxers) \
$(if $(CONFIG_FFMPEG_DECODE),,--disable-decoders 
--disable-demuxers) \
$(FFMPEG_CONFIGURE_ENCODERS) \
@@ -288,7 +289,7 @@
 endef
 
 define Package/ffprobe/install
-   $(INSTALL_DIR_ $(1)/usr/bin
+   $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/
 endef
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Typo in FFmpeg Makefile

2011-08-22 Thread Ian Leonard

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: multimedia/ffmpeg/Makefile
===
--- multimedia/ffmpeg/Makefile  (revision 28079)
+++ multimedia/ffmpeg/Makefile  (working copy)
@@ -288,7 +288,7 @@
 endef
 
 define Package/ffprobe/install
-   $(INSTALL_DIR_ $(1)/usr/bin
+   $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/
 endef
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] [PATCH v2] Version Bump Minidlna 1.0.21

2011-08-17 Thread Ian Leonard

Adjust minidlna for inotify becoming part of the default kernel.

minidlna.init: stop forcing a rescan (-R) of the media library on startup. 
Users will need to run it once after installing.

040-configuration-tweak.patch: enable use of inotify in the default 
configuration

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/multimedia/minidlna/files/minidlna.init
===
--- feeds/packages/multimedia/minidlna/files/minidlna.init  (revision 28033)
+++ feeds/packages/multimedia/minidlna/files/minidlna.init  (working copy)
@@ -7,7 +7,7 @@
 SSD=start-stop-daemon
 
 start() {
-   $SSD -p $PID -S -x $BIN -- -P $PID -R
+   $SSD -p $PID -S -x $BIN -- -P $PID
 }
 
 stop() {
Index: feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
===
--- feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(revision 28033)
+++ feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(working copy)
@@ -22,12 +22,3 @@
  
  # set this if you would like to specify the directory where you want MiniDLNA 
to store its database and album art cache
  #db_dir=/var/cache/minidlna
-@@ -28,7 +28,7 @@ album_art_names=Cover.jpg/cover.jpg/Albu
- 
- # set this to no to disable inotify monitoring to automatically discover new 
files
- # note: the default is yes
--inotify=yes
-+inotify=no
- 
- # set this to yes to enable support for streaming .jpg and .mp3 files to a 
TiVo supporting HMO
- enable_tivo=no
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] FFmpeg 0.8.2 Version Bump (#8831)

2011-08-17 Thread Ian Leonard

FFmpeg 0.8.2 Version Bump (#8831)

Dropped configure options:
--disable-ipv6: IPv6 is no longer a separate switch. It's network aware or 
isn't.
--disable-libfaad: This switch isn't listed as part of ./configure --help.
--disable-vhook: vhook is no longer a part of ffmpeg.

Added configure options:
--disable-doc: Disables documentation
--disable-dxva2: Disables Microsoft's DirectX Video Acceleration v2
--enable-version3: Builds GPLv3 code
--disable-filters: Disables audio/video stream processing filters
--disable-hwaccels: Disables hardware video playback acceleration
--disable-ffplay: FFplay is a SDL(?) based media player.

Dropped formats:
oss is not listed in ./configure --list-muxers
mpeg4aac is not listed in ./configure --list-decoders

Configure options were reordered to roughly be:

Generic program configure switches
Libav* feature options
Binary selection

All of the libav* feature disabling was done at once. This is to keep from 
second guessing FFmpeg's internal dependency checking when we start enabling 
options.

Added options to keep from mass disabling encoders/muxers and 
decoders/demuxers. This should address #8831's issue.

Added option to build FFprobe. FFprobe is a command line media identification 
tool, very similar to the output of a bare ffmpeg -i.

Signed-off-by: Ian Leonard antonla...@gmail.com
---

Note to testers: Many codecs were renamed between ffmpeg 0.5 and 0.6. Scripts 
calling ffmpeg will probably break. The ABI/API also changed.

My minimal build increased libffmpeg's size by about 110KB using the same 
configuration from 0.5, if memory serves me correctly.

There is a part of the Makefile that notes why mmx and mmx2 are disabled 
(register starvation, I believe). I do not have a suitable machine to test if 
this is still necessary.

I only use libffmpeg. Testing welcome.

---
Index: feeds/packages/multimedia/ffmpeg/Config.in
===
--- feeds/packages/multimedia/ffmpeg/Config.in  (revision 28033)
+++ feeds/packages/multimedia/ffmpeg/Config.in  (working copy)
@@ -1,10 +1,14 @@
 menu Configuration
depends PACKAGE_libffmpeg
 
-config FFMPEG_IPV6
-   bool Enable IPv6
-   default IPV6
+config FFMPEG_ENCODE
+   bool Big Toggle for FFmpeg's encoder/muxer support
+   depends FFMPEG_PATENTED
 
+config FFMPEG_DECODE
+   bool Big Toggle for FFmpeg's decoder/demuxer support
+   depends FFMPEG_PATENTED
+
 config FFMPEG_PATENTED
bool Include patented codecs and technologies
default BUILD_PATENTED
@@ -27,7 +31,6 @@
select FFMPEG_DECODER_mpeg1video
select FFMPEG_DECODER_mpeg2video
select FFMPEG_DECODER_mpeg4
-   select FFMPEG_DECODER_mpeg4aac
select FFMPEG_DECODER_mpegvideo
select FFMPEG_DECODER_wmav1
select FFMPEG_DECODER_wmav2
@@ -49,7 +52,6 @@
select FFMPEG_DECODER_mpeg1video
select FFMPEG_DECODER_mpeg2video
select FFMPEG_DECODER_mpeg4
-   select FFMPEG_DECODER_mpeg4aac
select FFMPEG_DECODER_mpegvideo
select FFMPEG_DECODER_wmav1
select FFMPEG_DECODER_wmav2
@@ -153,10 +155,6 @@
bool MPEG-4
depends FFMPEG_PATENTED
 
-config FFMPEG_DECODER_mpeg4aac
-   bool MPEG-4 (AAC)
-   depends FFMPEG_PATENTED
-
 config FFMPEG_DECODER_pcm_s16be
bool PCM signed 16-bit big-endian
 
@@ -212,9 +210,6 @@
 config FFMPEG_MUXER_ogg
bool Ogg
 
-config FFMPEG_MUXER_oss
-   bool OSS (Open Sound System playback)
-
 config FFMPEG_MUXER_rtp
bool RTP
 
@@ -322,4 +317,3 @@
bool udp:
 
 endmenu
-
Index: feeds/packages/multimedia/ffmpeg/Makefile
===
--- feeds/packages/multimedia/ffmpeg/Makefile   (revision 28033)
+++ feeds/packages/multimedia/ffmpeg/Makefile   (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.5.4
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24
+PKG_MD5SUM:=967d481c98161582d149aced6e3b2f31
 
 FFMPEG_ENCODERS:= \
ac3 \
@@ -40,7 +40,6 @@
mpeg1video \
mpeg2video \
mpeg4 \
-   mpeg4aac \
mpegvideo \
pcm_s16be \
pcm_s16le \
@@ -60,7 +59,6 @@
mpeg2video \
mpegts \
ogg \
-   oss \
rtp \
 
 FFMPEG_DEMUXERS:= \
@@ -127,6 +125,20 @@
  This package contains the FFmpeg command line tool.
 endef
 
+define Package/ffprobe
+$(call Package/ffmpeg/Default)
+ SECTION:=multimedia
+ CATEGORY:=Multimedia
+ TITLE+= CLI media identifier
+ DEPENDS+= +libffmpeg
+endef
+
+define Package/ffprobe/description
+$(call Package/ffmpeg/Default/description)
+ .
+ This package contains the FFprobe command line tool.
+endef
+
 define Package/ffserver
 $(call Package/ffserver/Default)
  SECTION:=multimedia
@@ -154,7 +166,7

Re: [OpenWrt-Devel] [PATCH v2] Version Bump Minidlna 1.0.21

2011-08-10 Thread Ian Leonard

Version bump minidlna 1.0.21 v2

v2: adjusts 040-configuration-tweak.patch as default kernels enable inotify.

v1: 010-genconfig-checks.patch adjusts two configure checks to use ICONV_PREFIX 
and INTL_PREFIX. These changes were already made previously elsewhere in the 
build process and looks like it was just overlooked here.

040-configuration-tweak.patch was to rebase.

Minidlna's changes were primarily bug fixes and compatibility with newer ffmpeg.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
===
--- feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(revision 27933)
+++ feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(working copy)
@@ -3,7 +3,7 @@
 @@ -2,7 +2,7 @@
  port=8200
  
- # network interface to bind to (this is the only interface that will serve 
files)
+ # network interfaces to serve, comma delimited
 -#network_interface=eth0
 +network_interface=br-lan
  
@@ -22,12 +22,3 @@
  
  # set this if you would like to specify the directory where you want MiniDLNA 
to store its database and album art cache
  #db_dir=/var/cache/minidlna
-@@ -28,7 +28,7 @@ album_art_names=Cover.jpg/cover.jpg/Albu
- 
- # set this to no to disable inotify monitoring to automatically discover new 
files
- # note: the default is yes
--inotify=yes
-+inotify=no
- 
- # set this to yes to enable support for streaming .jpg and .mp3 files to a 
TiVo supporting HMO
- enable_tivo=no
Index: feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch
===
--- feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch   
(revision 27933)
+++ feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch   
(working copy)
@@ -39,3 +39,21 @@
  if [ -n $MISSING ]; then
echo -e \nERROR!  Cannot continue.
echo -e The following required libraries are either missing, or are 
missing development headers:\n
+@@ -184,7 +184,7 @@ fi
+ echo   ${CONFIGFILE}
+ 
+ echo /* Enable if the system iconv.h exists.  ID3 tag reading in various 
character sets will not work properly otherwise. */  ${CONFIGFILE}
+-if [ -f /usr/include/iconv.h ]; then
++if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then
+ echo #define HAVE_ICONV_H  ${CONFIGFILE}
+ else
+ echo -e \nWARNING!!  Iconv support not found.  ID3 tag reading may not work.
+@@ -193,7 +193,7 @@ fi
+ echo   ${CONFIGFILE}
+ 
+ echo /* Enable if the system libintl.h exists for NLS support. */  
${CONFIGFILE}
+-if [ -f /usr/include/libintl.h ]; then
++if [ -f ${INTL_PREFIX}/include/libintl.h ]; then
+ echo #define ENABLE_NLS  ${CONFIGFILE}
+ else
+ echo /*#define ENABLE_NLS*/  ${CONFIGFILE}
Index: feeds/packages/multimedia/minidlna/Makefile
===
--- feeds/packages/multimedia/minidlna/Makefile (revision 27933)
+++ feeds/packages/multimedia/minidlna/Makefile (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=8bb5f2c0abc009e16039d7deecf09cf6
+PKG_MD5SUM:=a53e0008ad225843a1782e4af6e5bf0b
 
 PKG_BUILD_PARALLEL:=0
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version Bump Minidlna 1.0.21

2011-07-31 Thread Ian Leonard

Version bump minidlna 1.0.21

010-genconfig-checks.patch adjusts two configure checks to use ICONV_PREFIX and 
INTL_PREFIX. These changes were already made previously elsewhere in the build 
process and looks like it was just overlooked here.

040-configuration-tweak.patch was to rebase.

Minidlna's changes were primarily bug fixes and compatibility with newer ffmpeg.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
===
--- feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(revision 27842)
+++ feeds/packages/multimedia/minidlna/patches/040-configuration-tweak.patch
(working copy)
@@ -3,7 +3,7 @@
 @@ -2,7 +2,7 @@
  port=8200
  
- # network interface to bind to (this is the only interface that will serve 
files)
+ # network interfaces to serve, comma delimited
 -#network_interface=eth0
 +network_interface=br-lan
  
Index: feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch
===
--- feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch   
(revision 27842)
+++ feeds/packages/multimedia/minidlna/patches/010-genconfig-checks.patch   
(working copy)
@@ -39,3 +39,21 @@
  if [ -n $MISSING ]; then
echo -e \nERROR!  Cannot continue.
echo -e The following required libraries are either missing, or are 
missing development headers:\n
+@@ -184,7 +184,7 @@ fi
+ echo   ${CONFIGFILE}
+ 
+ echo /* Enable if the system iconv.h exists.  ID3 tag reading in various 
character sets will not work properly otherwise. */  ${CONFIGFILE}
+-if [ -f /usr/include/iconv.h ]; then
++if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then
+ echo #define HAVE_ICONV_H  ${CONFIGFILE}
+ else
+ echo -e \nWARNING!!  Iconv support not found.  ID3 tag reading may not work.
+@@ -193,7 +193,7 @@ fi
+ echo   ${CONFIGFILE}
+ 
+ echo /* Enable if the system libintl.h exists for NLS support. */  
${CONFIGFILE}
+-if [ -f /usr/include/libintl.h ]; then
++if [ -f ${INTL_PREFIX}/include/libintl.h ]; then
+ echo #define ENABLE_NLS  ${CONFIGFILE}
+ else
+ echo /*#define ENABLE_NLS*/  ${CONFIGFILE}
Index: feeds/packages/multimedia/minidlna/Makefile
===
--- feeds/packages/multimedia/minidlna/Makefile (revision 27842)
+++ feeds/packages/multimedia/minidlna/Makefile (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=1c5230cc6dec7592eca4c63c526eadb7
+PKG_MD5SUM:=a53e0008ad225843a1782e4af6e5bf0b
 
 PKG_BUILD_PARALLEL:=0
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version Bump Minidlna 1.0.20

2011-07-11 Thread Ian Leonard

Primary changes are adding support for streaming to more hardware.

Signed-off-by: Ian Leonard antonla...@gmail.com

---
Index: feeds/packages/multimedia/minidlna/Makefile
===
--- feeds/packages/multimedia/minidlna/Makefile (revision 27574)
+++ feeds/packages/multimedia/minidlna/Makefile (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minidlna
-PKG_VERSION:=1.0.19
+PKG_VERSION:=1.0.20
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
-PKG_MD5SUM:=8bb5f2c0abc009e16039d7deecf09cf6
+PKG_MD5SUM:=1c5230cc6dec7592eca4c63c526eadb7
 
 PKG_BUILD_PARALLEL:=0
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] rsyncd: Add description and allow rsyncd.conf to survive sysupgrade

2011-06-16 Thread Ian Leonard

Add description and conffiles entry for rsyncd to rsync's Makefile.

Move rsyncd.conf install to /etc/config/ and adjust initscript accordingly. 
Allows rsyncd.conf to survive a sysupgrade.

Signed-off-by: Ian Leonard antonla...@gmail.com

---

Index: feeds/packages/net/rsync/files/rsyncd.init
===
--- feeds/packages/net/rsync/files/rsyncd.init  (revision 27191)
+++ feeds/packages/net/rsync/files/rsyncd.init  (working copy)
@@ -3,11 +3,12 @@
 
 START=50
 BIN=/usr/bin/rsync
+CONFIG=/etc/config/rsyncd
 PID=/var/run/rsyncd.pid
 SSD=start-stop-daemon
 
 start() {
-   $SSD -p $PID -S -x $BIN -- --daemon
+   $SSD -p $PID -S -x $BIN -- --daemon --config=$CONFIG
 }
 
 stop() {
Index: feeds/packages/net/rsync/Makefile
===
--- feeds/packages/net/rsync/Makefile   (revision 27191)
+++ feeds/packages/net/rsync/Makefile   (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=rsync
 PKG_VERSION:=3.0.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
@@ -61,9 +61,19 @@
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 endef
 
+define Package/rsyncd/description
+   rsyncd is a configuration file and initscript to
+   utilize rsync as a daemon. It uses the same binary
+   as rsync.
+endef
+
+define Package/rsyncd/conffiles
+/etc/config/rsyncd
+endef
+
 define Package/rsyncd/install
-   $(INSTALL_DIR) $(1)/etc
-   $(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
+   $(INSTALL_DIR) $(1)/etc/config
+   $(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/config/rsyncd
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd
 endef
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH v2] rsyncd: Add description and conffiles entry

2011-06-16 Thread Ian Leonard

Add description and conffiles entry for rsyncd to rsync's Makefile.

Signed-off-by: Ian Leonard antonla...@gmail.com

---

Index: feeds/packages/net/rsync/Makefile
===
--- feeds/packages/net/rsync/Makefile   (revision 27191)
+++ feeds/packages/net/rsync/Makefile   (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=rsync
 PKG_VERSION:=3.0.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
@@ -61,6 +61,16 @@
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 endef
 
+define Package/rsyncd/description
+   rsyncd is a configuration file and initscript to
+   utilize rsync as a daemon. It uses the same binary
+   as rsync.
+endef
+
+define Package/rsyncd/conffiles
+/etc/rsyncd.conf
+endef
+
 define Package/rsyncd/install
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version bump hd-idle 1.03

2011-04-08 Thread Ian Leonard

Version bump hd-idle to 1.03. 1.02 and 1.03 were bugfix releases.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/utils/hd-idle/Makefile
===
--- feeds/packages/utils/hd-idle/Makefile   (revision 26531)
+++ feeds/packages/utils/hd-idle/Makefile   (working copy)
@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hd-idle
-PKG_REV:=1.01
+PKG_REV:=1.03
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=bfb7db4d4372d3954b7cd96a11956741
+PKG_MD5SUM:=049d6e6fc703a7e0474bdd9c24e6de77
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Add initscript for rsync daemon

2011-04-08 Thread Ian Leonard

Add an initscript to the rsync package for use as a daemon, and a sample 
rsyncd.conf to show a simple setup.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/net/rsync/files/rsyncd.init
===
--- feeds/packages/net/rsync/files/rsyncd.init  (revision 0)
+++ feeds/packages/net/rsync/files/rsyncd.init  (revision 0)
@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2011 OpenWrt.org
+
+START=50
+BIN=/usr/bin/rsync
+PID=/var/run/rsyncd.pid
+SSD=start-stop-daemon
+
+start() {
+   $SSD -p $PID -S -x $BIN -- --daemon 
+}
+
+stop() {
+   $SSD -p $PID -K
+}
Index: feeds/packages/net/rsync/files/rsyncd.conf
===
--- feeds/packages/net/rsync/files/rsyncd.conf  (revision 0)
+++ feeds/packages/net/rsync/files/rsyncd.conf  (revision 0)
@@ -0,0 +1,15 @@
+# /etc/rsyncd.conf
+# Minimal configuration for rsync daemon
+
+# Next line required for init script
+pid file = /var/run/rsyncd.pid
+use chroot = yes
+uid = nobody
+gid = nogroup
+read only = yes
+
+# Simple example to configure server
+#[openwrt-etc]
+#path = /etc
+#comment = OpenWrt Configuration Files
+#exclude = /init.d
Index: feeds/packages/net/rsync/Makefile
===
--- feeds/packages/net/rsync/Makefile   (revision 26531)
+++ feeds/packages/net/rsync/Makefile   (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=rsync
 PKG_VERSION:=3.0.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
@@ -49,6 +49,10 @@
--disable-acl-support \
 
 define Package/rsync/install
+   $(INSTALL_DIR) $(1)/etc
+   $(INSTALL_DATA) ./files/rsyncd.conf $(1)/etc/
+   $(INSTALL_DIR) $(1)/etc/init.d
+   $(INSTALL_BIN) ./files/rsyncd.init $(1)/etc/init.d/rsyncd
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
 endef
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version bump Minidlna 1.0.19

2011-04-07 Thread Ian Leonard

Version bump minidlna to 1.0.19. I didn't find an official changelog. Reading a 
diff looks like a change in license from GPL v2 or later to strict GPL v2, as 
well as bug fixes and translation updates. It's streaming as expected. Two 
patches were rebased.

Signed-off-by: Ian Leonard antonla...@gmail.com
---
Index: feeds/packages/multimedia/minidlna/patches/002-makefile-tweaks.patch
===
--- feeds/packages/multimedia/minidlna/patches/002-makefile-tweaks.patch
(revision 26496)
+++ feeds/packages/multimedia/minidlna/patches/002-makefile-tweaks.patch
(working copy)
@@ -1,45 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -13,9 +13,21 @@
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
- CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
--   -I/usr/include/ffmpeg \
--   -I/usr/include/libavutil -I/usr/include/libavcodec 
-I/usr/include/libavformat \
--   -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec 
-I/usr/include/ffmpeg/libavformat
-+   -I$(STAGING_DIR)/usr/include \
-+   -I$(STAGING_DIR)/usr/include/FLAC \
-+   -I$(STAGING_DIR)/usr/include/libavcodec \
-+   -I$(STAGING_DIR)/usr/include/libavformat \
-+   -I$(STAGING_DIR)/usr/include/libavutil \
-+   -I$(STAGING_DIR)/usr/include/libexif \
-+   -I$(STAGING_DIR)/usr/include/uuid \
-+   -I$(STAGING_DIR)/usr/include/vorbis \
-+   -I$(ICONV_PREFIX)/include \
-+   -I$(INTL_PREFIX)/include
-+LDFLAGS = -L$(STAGING_DIR)/usr/lib \
-+-L$(ICONV_PREFIX)/lib \
-+-L$(INTL_PREFIX)/lib \
-+-Wl,-rpath=$(STAGING_DIR)/usr/lib \
-+-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
- #STATIC_LINKING: LDFLAGS = -static
- CC = gcc
- RM = rm -f
-@@ -36,7 +48,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
- 
- ALLOBJS = $(BASEOBJS) $(LNXOBJS)
- 
--LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC -lvorbis
-+LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lid3tag -lFLAC 
-lvorbis -luuid
- #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg 
-lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
- 
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-@@ -58,7 +70,7 @@ install: minidlna
-   $(INSTALL) -d $(ETCINSTALLDIR)
-   $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
- 
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna: $(BASEOBJS) $(LNXOBJS)
-   @echo Linking $@
-   @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
- 
Index: feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch
===
--- feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch
(revision 0)
+++ feeds/packages/multimedia/minidlna/patches/020-makefile-tweaks.patch
(revision 0)
@@ -0,0 +1,46 @@
+--- a/Makefile
 b/Makefile
+@@ -13,9 +13,22 @@
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+ CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+-   -I/usr/include/ffmpeg \
+-   -I/usr/include/libavutil -I/usr/include/libavcodec 
-I/usr/include/libavformat \
+-   -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec 
-I/usr/include/ffmpeg/libavformat
++   -I$(STAGING_DIR)/usr/include \
++   -I$(STAGING_DIR)/usr/include/FLAC \
++   -I$(STAGING_DIR)/usr/include/libavcodec \
++   -I$(STAGING_DIR)/usr/include/libavformat \
++   -I$(STAGING_DIR)/usr/include/libavutil \
++   -I$(STAGING_DIR)/usr/include/libexif \
++   -I$(STAGING_DIR)/usr/include/uuid \
++   -I$(STAGING_DIR)/usr/include/vorbis \
++   -I$(ICONV_PREFIX)/include \
++   -I$(INTL_PREFIX)/include
++LDFLAGS = -L$(STAGING_DIR)/usr/lib \
++   -L$(ICONV_PREFIX)/lib \
++   -L$(INTL_PREFIX)/include \
++   -Wl,-rpath=$(STAGING_DIR)/usr/lib \
++   -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
++
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+ CC = gcc
+@@ -37,7 +50,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
+ 
+ ALLOBJS = $(BASEOBJS) $(LNXOBJS)
+ 
+-LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec 
-lid3tag -lFLAC -logg -lvorbis
++LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil 
-lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid
+ #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg 
-lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
+ 
+ TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
+@@ -62,7 +75,7 @@ install: minidlna
+   $(INSTALL) -d $(ETCINSTALLDIR)
+   $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
+ 
+-minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
++minidlna: $(BASEOBJS) $(LNXOBJS)
+   @echo Linking $@
+   @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
+ 
Index

[OpenWrt-Devel] PATCH 2/2] Add minidlna profile to ffmpeg

2011-04-02 Thread Ian Leonard

This adds a profile to ffmpeg to support minidlna, similar to the 
libdlna/ushare profile. When minidlna encounters media, it uses ffmpeg to 
figure out what it is. If ffmpeg fails to open it, then minidlna will try and 
fail to read the file on its own. The profile may need to be extended; I 
attempted to cover all popular formats for dlna streaming.

Tested with the following container/codec combinations:

mkv with ac3/h264/srt
mp4 with aac/h264/ttxt
ogg vorbis
flac
mp3

Should also be able to handle, but untested:
mpeg
avi
xvid
jpeg
png
wmv1
wmv2

Signed-off-by: Ian Leonard antonlacon_at_gmail.com

---
Index: feeds/packages/multimedia/ffmpeg/Config.in
===
--- feeds/packages/multimedia/ffmpeg/Config.in  (revision 26399)
+++ feeds/packages/multimedia/ffmpeg/Config.in  (working copy)
@@ -37,6 +37,34 @@
select FFMPEG_DEMUXER_mp3
select FFMPEG_DEMUXER_mpegvideo
 
+config FFMPEG_MINIDLNA_SUPPORT
+   bool Include support for minidlna
+   depends FFMPEG_PATENTED
+   select FFMPEG_DECODER_aac
+   select FFMPEG_DECODER_ac3
+   select FFMPEG_DECODER_flac
+   select FFMPEG_DECODER_h264
+   select FFMPEG_DECODER_jpegls
+   select FFMPEG_DECODER_mp3
+   select FFMPEG_DECODER_mpeg1video
+   select FFMPEG_DECODER_mpeg2video
+   select FFMPEG_DECODER_mpeg4
+   select FFMPEG_DECODER_mpeg4aac
+   select FFMPEG_DECODER_mpegvideo
+   select FFMPEG_DECODER_wmav1
+   select FFMPEG_DECODER_wmav2
+   select FFMPEG_DECODER_png
+   select FFMPEG_DEMUXER_aac
+   select FFMPEG_DEMUXER_ac3
+   select FFMPEG_DEMUXER_avi
+   select FFMPEG_DEMUXER_flac
+   select FFMPEG_DEMUXER_h264
+   select FFMPEG_DEMUXER_matroska
+   select FFMPEG_DEMUXER_mov
+   select FFMPEG_DEMUXER_mp3
+   select FFMPEG_DEMUXER_mpegvideo
+   select FFMPEG_PROTOCOL_file
+
 comment Encoders ---
 
 config FFMPEG_ENCODER_ac3
Index: feeds/packages/multimedia/minidlna/Makefile
===
--- feeds/packages/multimedia/minidlna/Makefile (revision 26399)
+++ feeds/packages/multimedia/minidlna/Makefile (working copy)
@@ -9,7 +9,7 @@
 
 PKG_NAME:=minidlna
 PKG_VERSION:=1.0.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz
 PKG_SOURCE_URL:=@SF/minidlna
@@ -31,7 +31,7 @@
   TITLE:=UPnP A/V  DLNA Media Server
   URL:=http://minidlna.sourceforge.net/
   DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
-   +libid3tag +libflac +libvorbis +libuuid \
+   +@FFMPEG_MINIDLNA_SUPPORT +libid3tag +libflac +libvorbis +libuuid \
$(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 

___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version Bump Rsync 3.0.8

2011-04-01 Thread Ian Leonard

Version bump rsync to 3.0.8. This is a security/maintenance release.

Signed-off-by: Ian Leonard antonlacon_at_gmail.com

---
Index: feeds/packages/net/rsync/Makefile
===
--- feeds/packages/net/rsync/Makefile   (revision 26385)
+++ feeds/packages/net/rsync/Makefile   (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rsync
-PKG_VERSION:=3.0.7
+PKG_VERSION:=3.0.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/src
-PKG_MD5SUM:=b53525900817cf1ba7ad3a516ab5bfe9
+PKG_MD5SUM:=0ee8346ce16bdfe4c88a236e94c752b4
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] Version Bump Privoxy 3.0.17

2011-03-31 Thread Ian Leonard

Update privoxy to 3.0.17. This is a maintenance release.

Signed-off-by: Ian Leonard antonlacon_at_gmail.com

Index: feeds/packages/net/privoxy/Makefile
===
--- feeds/packages/net/privoxy/Makefile (revision 26385)
+++ feeds/packages/net/privoxy/Makefile (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
-PKG_VERSION:=3.0.16
+PKG_VERSION:=3.0.17
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa
-PKG_MD5SUM:=64d3ffcdf8307e04a375773bb4eb255e
+PKG_MD5SUM:=9d363d738a3f3d73e774d6dfeafdb15f
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable
 
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] ffmpeg 0.5.4 version bump

2011-03-24 Thread Ian Leonard

Version bump ffmpeg from 0.5.2 to 0.5.4. 0.5.3 and 0.5.4 are maintenance only 
releases for security and minor bug fixes.

(This is a first submission. If it's the wrong place, let me know where it 
should go.)

Signed-off-by: Ian Leonard antonlacon_at_gmail.com

---
Index: feeds/packages/multimedia/ffmpeg/Makefile
===
--- feeds/packages/multimedia/ffmpeg/Makefile   (revision 26270)
+++ feeds/packages/multimedia/ffmpeg/Makefile   (working copy)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.5.2
-PKG_RELEASE:=6
+PKG_VERSION:=0.5.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=451eb428ca97a72c00555d50944cdb24
+PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24
 
 FFMPEG_ENCODERS:= \
ac3 \
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

41 matches

Mail list logo