From: Stefan Briesenick Date: Tue, 1 May 2007 23:48:22 +0000 (+0000) Subject: added patches (BrowserLauncher2, subtitle clut, subtitle charset), added fast IDCT... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b93fc15f3bba97df94f09bac7f69cec3fa2bc407;p=gentoo.git added patches (BrowserLauncher2, subtitle clut, subtitle charset), added fast IDCT implementation. Package-Manager: portage-2.1.2.5 --- diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog index 08e547c1fce2..c6997ad4b9b5 100644 --- a/media-video/projectx/ChangeLog +++ b/media-video/projectx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/projectx # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.22 2007/03/11 22:11:27 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.23 2007/05/01 23:48:22 sbriesen Exp $ + +*projectx-0.90.4.00-r3 (01 May 2007) + + 01 May 2007; Stefan Briesenick + +projectx-0.90.4.00-r3.ebuild: + added patches (BrowserLauncher2, subtitle clut, subtitle charset), added + fast IDCT implementation. 11 Mar 2007; Stefan Briesenick files/build-0.90.4.xml, projectx-0.90.4.00-r2.ebuild: diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest index 1532b4b97b66..aff112a1ce5d 100644 --- a/media-video/projectx/Manifest +++ b/media-video/projectx/Manifest @@ -3,15 +3,21 @@ MD5 08b113adfeaaceca34d51f4241eb5555 files/build-0.90.4.xml 2037 RMD160 31314f6bae4df3a011c0bc33d15e5ae5dc914988 files/build-0.90.4.xml 2037 SHA256 fc25b4d5dad59cb1d30614879ef26f2ab689be145da9ff90d6995b3085d240c5 files/build-0.90.4.xml 2037 DIST ProjectX_LanguagePack_0.90.4.00.zip 124257 RMD160 09f63b0761568f5934960663e52a0043a48727ee SHA1 9887c7d9a81384e006efb6dd8ef2925add7def3f SHA256 eff00b1b623e8a0c986eb79472622fd771c1c44b9d9d83062e6cc0772e9fd841 +DIST ProjectX_Source_0.90.4-portable.zip 47775 RMD160 206deb5abb2e05a12ffe45994604fe4e6a4d80eb SHA1 e0d591677357d593d320ae281737eb9927c50e3b SHA256 e655315ba55ea9fdce96eff177eac9fd62453959a7a0259714aaca267e640434 DIST ProjectX_Source_eng_0.90.4.00.zip 825784 RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 SHA1 ef7be92217c276204fff290add0a9080c77b7eec SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537 +DIST projectx-patches-0.90.4.00-r3.tbz2 1394 RMD160 05e2c2936bcbbcb3344ca22ae0379e9e1d33a37c SHA1 e73aa3bc14e8015029ceeacbc2928b551b9354aa SHA256 57cb89ac50fc6418ae30cc68a4003fc3cc2c0eace8c7f9e108a863a1424fcde6 EBUILD projectx-0.90.4.00-r2.ebuild 2002 RMD160 bedde55130f2c795952d93d1d4a782ed6ce99eeb SHA1 b999e07f4a7bb4410323bc28bc68b925425f8e05 SHA256 41a1a6614a0b4ee270c0f1ffb268c65d789df172499bfb6f9620f243bfe49757 MD5 cf5a560c6b5a35c87d268b736556c18a projectx-0.90.4.00-r2.ebuild 2002 RMD160 bedde55130f2c795952d93d1d4a782ed6ce99eeb projectx-0.90.4.00-r2.ebuild 2002 SHA256 41a1a6614a0b4ee270c0f1ffb268c65d789df172499bfb6f9620f243bfe49757 projectx-0.90.4.00-r2.ebuild 2002 -MISC ChangeLog 2039 RMD160 49d2fa06aa5bb8128db328b75554a18a0d31a888 SHA1 33c60d23721ae027ab9017932ef7e811cf04a710 SHA256 46a82519597319b454313ad8793e70432d7e44f57770203503cd3cdbb69ab576 -MD5 4a261b987b97d6a214ac626fdeb6d46a ChangeLog 2039 -RMD160 49d2fa06aa5bb8128db328b75554a18a0d31a888 ChangeLog 2039 -SHA256 46a82519597319b454313ad8793e70432d7e44f57770203503cd3cdbb69ab576 ChangeLog 2039 +EBUILD projectx-0.90.4.00-r3.ebuild 3065 RMD160 338c140e0b527b75151dc3eff0d6eb83b3b1f48c SHA1 af914fbc17515cb708b63771c3b126ceddaf9670 SHA256 358bcfd9190bf826c4335c5004153968efde13ce53dbaa8029f67b96dc937a6d +MD5 bbfd37a5e19a257a19575a31b56892c3 projectx-0.90.4.00-r3.ebuild 3065 +RMD160 338c140e0b527b75151dc3eff0d6eb83b3b1f48c projectx-0.90.4.00-r3.ebuild 3065 +SHA256 358bcfd9190bf826c4335c5004153968efde13ce53dbaa8029f67b96dc937a6d projectx-0.90.4.00-r3.ebuild 3065 +MISC ChangeLog 2269 RMD160 2fd44521e6b09f2beb3de8c349ec6750e4f6552c SHA1 adb65efa91be68a5c10ca9e90f0822156c438199 SHA256 b85237587604e0db7482fb5961d630a6ede715a69cb226778b70d13ae56fc2b2 +MD5 de92272053113f3da3dd273a9e80488b ChangeLog 2269 +RMD160 2fd44521e6b09f2beb3de8c349ec6750e4f6552c ChangeLog 2269 +SHA256 b85237587604e0db7482fb5961d630a6ede715a69cb226778b70d13ae56fc2b2 ChangeLog 2269 MISC metadata.xml 552 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 SHA1 376eadcfc81a41cff52b15c0a2a90f530660171f SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f MD5 a5bc554bd20390118527a75f399aca04 metadata.xml 552 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 metadata.xml 552 @@ -19,3 +25,6 @@ SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f metadata MD5 7b4581f73e9f900c70c80e4fbde2eaf7 files/digest-projectx-0.90.4.00-r2 566 RMD160 37de8f0abb23d7161191e5129bdf15949525fb02 files/digest-projectx-0.90.4.00-r2 566 SHA256 0485d242e0b8e732f6c3c0a324b5cd42599809579f58ba18f8b45446e7203293 files/digest-projectx-0.90.4.00-r2 566 +MD5 414899a01df6bab8904aa4a7a93389a7 files/digest-projectx-0.90.4.00-r3 1126 +RMD160 48a90826d7857c1b0255ac273d6a9833cd9b3f5f files/digest-projectx-0.90.4.00-r3 1126 +SHA256 7dd00774070ee4e97378d091a1b3e6c54ad05f4aeee0cebfa6272f69af9b0875 files/digest-projectx-0.90.4.00-r3 1126 diff --git a/media-video/projectx/files/digest-projectx-0.90.4.00-r3 b/media-video/projectx/files/digest-projectx-0.90.4.00-r3 new file mode 100644 index 000000000000..ed9c945ec9bf --- /dev/null +++ b/media-video/projectx/files/digest-projectx-0.90.4.00-r3 @@ -0,0 +1,12 @@ +MD5 edfe8d04bd3d403eec4d9e27d1b976d2 ProjectX_LanguagePack_0.90.4.00.zip 124257 +RMD160 09f63b0761568f5934960663e52a0043a48727ee ProjectX_LanguagePack_0.90.4.00.zip 124257 +SHA256 eff00b1b623e8a0c986eb79472622fd771c1c44b9d9d83062e6cc0772e9fd841 ProjectX_LanguagePack_0.90.4.00.zip 124257 +MD5 d6e0ff5df64d1cd524bc3902bbc19b7a ProjectX_Source_0.90.4-portable.zip 47775 +RMD160 206deb5abb2e05a12ffe45994604fe4e6a4d80eb ProjectX_Source_0.90.4-portable.zip 47775 +SHA256 e655315ba55ea9fdce96eff177eac9fd62453959a7a0259714aaca267e640434 ProjectX_Source_0.90.4-portable.zip 47775 +MD5 92d7b5aea50b8811307f27b6e01ceb5c ProjectX_Source_eng_0.90.4.00.zip 825784 +RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 ProjectX_Source_eng_0.90.4.00.zip 825784 +SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537 ProjectX_Source_eng_0.90.4.00.zip 825784 +MD5 6d471345f35408e6a251c54776bc6be4 projectx-patches-0.90.4.00-r3.tbz2 1394 +RMD160 05e2c2936bcbbcb3344ca22ae0379e9e1d33a37c projectx-patches-0.90.4.00-r3.tbz2 1394 +SHA256 57cb89ac50fc6418ae30cc68a4003fc3cc2c0eace8c7f9e108a863a1424fcde6 projectx-patches-0.90.4.00-r3.tbz2 1394 diff --git a/media-video/projectx/projectx-0.90.4.00-r3.ebuild b/media-video/projectx/projectx-0.90.4.00-r3.ebuild new file mode 100644 index 000000000000..4f9afc5c96c6 --- /dev/null +++ b/media-video/projectx/projectx-0.90.4.00-r3.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00-r3.ebuild,v 1.1 2007/05/01 23:48:22 sbriesen Exp $ + +inherit eutils toolchain-funcs java-pkg-2 java-ant-2 + +MY_PN="ProjectX" + +# micro-release == 0 ? +if [ 0${PV##*.} -eq 0 ]; then + MY_P="${MY_PN}_Source_${PV%.*}" +else + MY_P="${MY_PN}_Source_${PV}" +fi + +DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings" +HOMEPAGE="http://project-x.sourceforge.net/" +SRC_URI="mirror://sourceforge/project-x/${MY_PN}_Source_eng_${PV}.zip + mirror://sourceforge/project-x/${MY_PN}_LanguagePack_${PV}.zip + http://sbriesen.de/gentoo/distfiles/${PN}-patches-${PVR}.tbz2 + http://sbriesen.de/gentoo/distfiles/${MY_P}-portable.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="X doc source mmx" + +COMMON_DEP="dev-java/commons-net + X? ( =dev-java/browserlauncher2-1.0* )" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" + +DEPEND=">=virtual/jdk-1.4 + ${COMMON_DEP} + app-arch/unzip + dev-java/ant-core + source? ( app-arch/zip )" + +S="${WORKDIR}/${MY_P}" + +mainclass() { + # read Main-Class from MANIFEST.MF + sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # copy build.xml + cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml + + # patch location of executable + sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop + + # convert CRLF to LF + edos2unix *.txt MANIFEST.MF + + # apply subtitle clut patch + epatch "${WORKDIR}/${PN}-${PV%.*}-clut.diff" + + # apply subtitle charset patch + epatch "${WORKDIR}/${PN}-${PV%.*}-charset.diff" + + # apply BrowserLauncher2 patch + use X && epatch "${WORKDIR}/${PN}-${PV%.*}-bl2.diff" + rm -rf src/edu + + # cleanup idctfast patchset + rm -f lib/PORTABLE/*.{o,so} + rm -f src/net/sourceforge/dvb/projectx/video/IDCT{Ref,Sse}Native.java + sed -i -e "s:gcc:\$(CC):g" -e "s: -O2::g" lib/PORTABLE/Makefile + + # merge/remove resources depending on USE="X" + if use X; then + mv -f htmls resources/ + else + rm -rf src/net/sourceforge/dvb/projectx/gui + rm resources/*.gif + fi + + # update library packages + cd lib + rm -f {commons-net,jakarta-oro}*.jar + java-pkg_jar-from commons-net + use X && java-pkg_jar-from browserlauncher2-1.0 + java-pkg_ensure-no-bundled-jars +} + +src_compile() { + local IDCT="idct-mjpeg" # default IDCT implementation + use x86 && use mmx && IDCT="idct-mjpeg-mmx" + + eant build $(use_doc) -Dmanifest.mainclass=$(mainclass) + + cd lib/PORTABLE + emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \ + CPLAT="${CFLAGS} -ffast-math -fPIC" || die "emake failed" +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + java-pkg_doso lib/PORTABLE/libidctfast.so + + java-pkg_dolauncher ${PN}_nogui --main $(mainclass) \ + --java_args "-Djava.awt.headless=true" + + if use X; then + java-pkg_dolauncher ${PN}_gui --main $(mainclass) + dosym ${PN}_gui /usr/bin/${PN} + domenu *.desktop + else + dosym ${PN}_nogui /usr/bin/${PN} + fi + + dodoc *.txt + use doc && java-pkg_dojavadoc apidocs + use source && java-pkg_dosrc src +}