Version bump, misc fixes.

svn path=/; revision=512

2 files changed, 34 insertions, 9 deletions

diff --git a/www-servers/wowza/Manifest b/www-servers/wowza/Manifest
index bb58d49..831ea59 100644
--- a/www-servers/wowza/Manifest
+++ b/www-servers/wowza/Manifest
@@ -1,3 +1,3 @@
-DIST WowzaMediaServer-3.0.5.tar.bin 63609797 RMD160 4c71b5a5a4f46c7fe1d5fc9b0acf623397b57e3c SHA1 67b37764320057dc3840292f607f509eb96e07ef SHA256 94880ce8ad59bc68b409a7ad7d05eca6dad682b7cdb7b727e06738e40dbac3d2
-DIST WowzaMediaServer3.0.5-patch2.zip 20405091 RMD160 3a00b2edd46423848865462a6a5d6441e9c8f757 SHA1 75ecd44c99d9eda9714ca544b905412db50e2ad9 SHA256 65c1c6c679b85742eb6af012a32d2b1eb19d107f2b3c1de7072a3b89a83cb92d
-EBUILD wowza-3.0.5_p2.ebuild 2771 RMD160 99dc3d248b54d5c6e6c65d470c534a10fb7657fe SHA1 6297f12e14737c2a8832530a20eee42a17006776 SHA256 a07ce7b2978b18cc9b0c5b90a4c30484a39e08754e56584eb7307bc0ea218e8c
+DIST WowzaMediaServer-3.1.1.tar.bin 68096230 RMD160 c28faeda619301ee153e02aaf435d6c4fceaf653 SHA1 93d5fa905d594c52c31ec84fe127c75c3f136077 SHA256 55e3e858d110ca2a6dc16da459b440b49424dc959937e483fc00fa1c505465ca
+DIST wms-plugin-bwcheck.zip 7621 RMD160 03f969ff324962ff10f2113e95ab26e5a74fa397 SHA1 ba7295a2df9b095367c3146ef541b0d2c2070dbb SHA256 f3ab8a6823743c271152d7ab944b2281d575d3f027fa690fc76ca7ba9f4b0e0c
+EBUILD wowza-3.1.1.ebuild 3806 RMD160 abdc8ed5c56b8369270838776d99cd784e62844a SHA1 23580d85c2e380fdc36731000b097d2254ea8e1e SHA256 a4c499c78bdf90e1eeefbbfd1f8a1dd259f52bb791aaa268eef1f7a9283ee27d
diff --git a/www-servers/wowza/wowza-3.0.5_p2.ebuild b/www-servers/wowza/wowza-3.1.1.ebuild
index f693186..6a4a9a8 100644
--- a/www-servers/wowza/wowza-3.0.5_p2.ebuild
+++ b/www-servers/wowza/wowza-3.1.1.ebuild
@@ -9,9 +9,12 @@ inherit versionator
 MY_PN="WowzaMediaServer"
 MY_P="${MY_PN}-${PV%_p*}"
 MY_PP="${MY_PN}-$(replace_all_version_separators - ${PV%_p*})"
+JOLOKIA=jolokia-1.0.2-bin
 DESCRIPTION="High-performance server for unified media streaming to any screen (rtmp, hls, hds)"
 HOMEPAGE="http://www.wowza.com/"
-SRC_URI="http://www.wowza.com/downloads/${MY_PP}/${MY_P}.tar.bin"
+SRC_URI="http://www.wowza.com/downloads/${MY_PP}/${MY_P}.tar.bin
+bwcheck? ( http://www.wowzamedia.com/downloads/forums/bwcheck/wms-plugin-bwcheck.zip )"
+#jolokia? ( http://www.jolokia.org/dist/1.0.2/${JOLOKIA}.zip )"
 
 if [[ ${PV/_p} != ${PV} ]]; then
 	SRC_URI+=" http://www.wowza.com/downloads/${MY_PP}/${MY_PN}${PV/_p/-patch}.zip"
@@ -20,13 +23,14 @@ fi
 LICENSE="wowza-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+bwcheck"
 RESTRICT=""
 
 DEPEND=""
 RDEPEND="virtual/jdk"
 
 WDESTDIR="/opt/wowza"
+EXT_DIR="/media/store1/support/wowza-jars/"
 
 SED_LOCAL_FILES="bin/WowzaMediaServerOSX bin/setenv.sh bin/WowzaMediaServer
 README.html examples/VideoChat/install.sh
@@ -50,6 +54,15 @@ src_unpack() {
 	if [[ ${PV/_p} != ${PV} ]]; then
 		unpack "${MY_PN}${PV/_p/-patch}.zip"
 	fi
+	use bwcheck && unpack wms-plugin-bwcheck.zip
+	#use jolokia && unpack ${JOLOKIA}.zip
+	if [[ -d ${EXT_DIR} ]]; then
+		mkdir libs
+		for lib in "${EXT_DIR}"/*.jar; do
+			elog "Preparing to install ${lib##*/} extension."
+			cp "${lib}" "${WORKDIR}/libs" || die
+		done
+	fi
 }
 
 src_prepare() {
@@ -58,9 +71,9 @@ src_prepare() {
 		-e "1,855{s|/usr/local/WowzaMediaServer|${WDESTDIR}/WowzaMediaServer|g}" "${S}/${MY_P}.tar.bin"
 	chmod +x "${S}/${MY_P}.tar.bin" || die
 	if [[ ${PV/_p} != ${PV} ]]; then
-		rm -rf ${WORKDIR}/${MY_PN}${PV/_p/-patch}/lib-native/win64 || die
+		rm -rf "${WORKDIR}/${MY_PN}${PV/_p/-patch}/lib-native/win64" || die
 	fi
-	echo "CONFIG_PROTECT=\"${EPREFIX}${WDESTDIR}/${MY_P}/conf\"" > "${T}/50${PN}"
+	echo "CONFIG_PROTECT=\"${EPREFIX}${WDESTDIR}/${MY_P}/conf ${EPREFIX}${WDESTDIR}/${MY_P}/bin/setenv.sh\"" >> "${T}/50${PN}"
 }
 
 src_compile() { :; }
@@ -72,10 +85,22 @@ src_install() {
 	if [[ ${PV/_p} != ${PV} ]]; then
 		einfo "Applying ${MY_PN}${PV/_p/-patch}.zip"
 		pushd "${WORKDIR}/${MY_PN}${PV/_p/-patch}" >/dev/null
-		find . -type d -exec mkdir -v -p ${ED}${WDESTDIR}/${MY_P}/'{}' \; || die
-		find . -type f -exec cp -v '{}' ${ED}${WDESTDIR}/${MY_P}/'{}' \; || die
+		find . -type d -exec mkdir -v -p "${ED}${WDESTDIR}/${MY_P}"/'{}' \; || die
+		find . -type f -exec cp -v '{}' "${ED}${WDESTDIR}/${MY_P}"/'{}' \; || die
 		popd >/dev/null
 	fi
+	# Fix execution permissions on all files
+	find "${ED}${WDESTDIR}/${MY_P}/" -type f -exec chmod -x '{}' \;
+	chmod +x "${ED}${WDESTDIR}/${MY_P}/bin"/*.sh || die
+	chmod +x "${ED}${WDESTDIR}/${MY_P}/bin"/WowzaMediaServer* || die
+
+	if use bwcheck; then
+		cp -v "${WORKDIR}/wms-plugin-bwcheck/wms-plugin-bwcheck.jar" "${ED}${WDESTDIR}/${MY_P}/lib/" || die
+	fi
+	for lib in "${WORKDIR}/libs"/*; do
+		elog "Installing ${lib##*/}..."
+		cp -v "${lib}" "${ED}${WDESTDIR}/${MY_P}/lib/" || die
+	done
 
 	pushd "${ED}${WDESTDIR}/WowzaMediaServer/" >/dev/null
 	sed -i -e "s|/usr/local|${WDESTDIR}|" ${SED_LOCAL_FILES}