[oe-commits] org.oe.dev merge of '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'

[hrw commit]

merge of '6b7b8a54d7265a7382da09d8df6a830b3be30fc4'
     and '9ca4252efb9948ce173f616c937012398a0b2c42'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 2e6d644fadaae847990c7d7a30bff1ecfd9e4552
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2e6d644fadaae847990c7d7a30bff1ecfd9e4552
Files:
1
packages/brutefir/brutefir_1.0i.bb
packages/thc/thcrut_1.2.5.bb
packages/lighttpd/lighttpd_1.4.13.bb
packages/lighttpd/lighttpd_1.4.15.bb
packages/lighttpd/lighttpd_1.4.16.bb
Diffs:

#
# mt diff -r6b7b8a54d7265a7382da09d8df6a830b3be30fc4 -r2e6d644fadaae847990c7d7a30bff1ecfd9e4552
#
# 
# 
# patch "packages/brutefir/brutefir_1.0i.bb"
#  from [e02d07dc7527439ee60d4c2ec25ba9b3d2df741b]
#    to [b055cef93c54cc43e7e096fdf1eb621bdc58fb2a]
# 
# patch "packages/thc/thcrut_1.2.5.bb"
#  from [2f657d8faa27de41e2655a314fcc09fcb2df8a7e]
#    to [3dbdb20fdb8da483b3a6cf04962de7fe6321db1f]
# 
============================================================
--- packages/brutefir/brutefir_1.0i.bb	e02d07dc7527439ee60d4c2ec25ba9b3d2df741b
+++ packages/brutefir/brutefir_1.0i.bb	b055cef93c54cc43e7e096fdf1eb621bdc58fb2a
@@ -1,7 +1,7 @@ LICENSE = "GPLv2"
 DESCRIPTION = "BruteFIR is a software convolution engine, a program for applying long FIR filters to multi-channel digital audio, either offline or in realtime."
 LICENSE = "GPLv2"
 
-DEPENDS = "fftw fftwf fftwl"
+DEPENDS = "alsa-lib fftw fftwf fftwl"
 
 PR = "r1"
 
============================================================
--- packages/thc/thcrut_1.2.5.bb	2f657d8faa27de41e2655a314fcc09fcb2df8a7e
+++ packages/thc/thcrut_1.2.5.bb	3dbdb20fdb8da483b3a6cf04962de7fe6321db1f
@@ -1,6 +1,6 @@ SECTION = "console/network"
 DESCRIPTION = "RUT (aRe-yoU-There) RUT gathers informations from local and remote networks"
 SECTION = "console/network"
-DEPENDS = "openssl libnet"
+DEPENDS = "libpcre openssl libnet libpcap"
 HOMEPAGE = "http://thc.org/thc-rut/"
 LICENSE = "GPL"
 PR = "r1"


#
# mt diff -r9ca4252efb9948ce173f616c937012398a0b2c42 -r2e6d644fadaae847990c7d7a30bff1ecfd9e4552
#
# 
# 
# delete "packages/lighttpd/lighttpd_1.4.13.bb"
# 
# rename "packages/lighttpd/lighttpd_1.4.15.bb"
#     to "packages/lighttpd/lighttpd_1.4.16.bb"
# 
# patch "packages/lighttpd/lighttpd_1.4.16.bb"
#  from [80df13ced322353f2d1d271b79bba2e817effd2c]
#    to [430d84860a0bc15af2e58a72402d5c70f9277ee2]
# 
============================================================
--- packages/lighttpd/lighttpd_1.4.15.bb	80df13ced322353f2d1d271b79bba2e817effd2c
+++ packages/lighttpd/lighttpd_1.4.16.bb	430d84860a0bc15af2e58a72402d5c70f9277ee2
@@ -1,9 +1,9 @@ LICENSE = "BSD"
 DESCRIPTION = "Web server"
 SECTION = "net"
 LICENSE = "BSD"
-PR = "r1"
+DEPENDS = "libpcre"
 
-SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.15.tar.gz \
+SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
 	   file://configure.in.patch;patch=1 \
 	   file://src-server.c.patch;patch=1 \
 	   file://index.html \
@@ -14,7 +14,7 @@ EXTRA_OECONF="--without-bzip2 \
 		--without-ldap \
 		--without-lua \
 		--without-memcache \
-		--without-pcre \
+		--with-pcre \
 		--without-webdav-props \
 		--without-webdav-locks \
 		--without-openssl \