diff options
author | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2013-02-19 21:10:18 (GMT) |
commit | 2648e999d277eac5c3d331a3609bcc73fafbea71 (patch) | |
tree | 40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/extra/projectx | |
parent | c759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff) | |
parent | 7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff) | |
download | linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2 |
Merge branch 'testing'
# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish
Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables.
xf86-video-ati: xorg ati driver.
LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE.
LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop.
e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902
zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to
linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink
runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900
iguanair: rebuild with python 2.7
LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
linhes-udev-rules: add rules for mce,streamzap,serial lirc devices.
mythinstall: recompile for matching libs
mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager
linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV
linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
...
Diffstat (limited to 'abs/extra/projectx')
-rw-r--r-- | abs/extra/projectx/IDCTFast.patch | 86 | ||||
-rw-r--r-- | abs/extra/projectx/PKGBUILD | 57 | ||||
-rw-r--r-- | abs/extra/projectx/projectx | 10 |
3 files changed, 153 insertions, 0 deletions
diff --git a/abs/extra/projectx/IDCTFast.patch b/abs/extra/projectx/IDCTFast.patch new file mode 100644 index 0000000..70487bf --- /dev/null +++ b/abs/extra/projectx/IDCTFast.patch @@ -0,0 +1,86 @@ +diff -ru Project-X_0.91.0//noguisources.lst Project-X_0.91.0.new/noguisources.lst +--- Project-X_0.91.0//noguisources.lst 2011-03-27 15:48:48.000000000 +0200 ++++ Project-X_0.91.0.new/noguisources.lst 2011-04-09 16:54:28.886676016 +0200 +@@ -67,6 +67,7 @@ + src/net/sourceforge/dvb/projectx/video/IDCTRefNative.java
+ src/net/sourceforge/dvb/projectx/video/IDCTSseNative.java
+ src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
++src/net/sourceforge/dvb/projectx/video/IDCTFast.java + src/net/sourceforge/dvb/projectx/video/Preview.java
+ src/net/sourceforge/dvb/projectx/video/PreviewObject.java
+ src/net/sourceforge/dvb/projectx/video/Video.java
+Binary files Project-X_0.91.0//ProjectX.jar and Project-X_0.91.0.new/ProjectX.jar differ +diff -ru Project-X_0.91.0//sources.lst Project-X_0.91.0.new/sources.lst +--- Project-X_0.91.0//sources.lst 2011-03-27 15:02:42.000000000 +0200 ++++ Project-X_0.91.0.new/sources.lst 2011-04-09 16:54:12.916676017 +0200 +@@ -67,6 +67,7 @@ + src/net/sourceforge/dvb/projectx/video/IDCTRefNative.java
+ src/net/sourceforge/dvb/projectx/video/IDCTSseNative.java
+ src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
++src/net/sourceforge/dvb/projectx/video/IDCTFast.java + src/net/sourceforge/dvb/projectx/video/Preview.java
+ src/net/sourceforge/dvb/projectx/video/PreviewObject.java
+ src/net/sourceforge/dvb/projectx/video/Video.java
+diff -ru Project-X_0.91.0//src/net/sourceforge/dvb/projectx/video/MpvDecoder.java Project-X_0.91.0.new/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java +--- Project-X_0.91.0//src/net/sourceforge/dvb/projectx/video/MpvDecoder.java 2011-03-27 15:01:38.000000000 +0200 ++++ Project-X_0.91.0.new/src/net/sourceforge/dvb/projectx/video/MpvDecoder.java 2011-04-09 16:51:16.936676017 +0200 +@@ -74,6 +74,7 @@ +
+ private IDCTRefNative idct;
+ private IDCTSseNative idctsse;
++ private IDCTFast idctfast; +
+ private int preview_horizontal_size = 512;
+ private int preview_vertical_size = 288;
+@@ -133,14 +134,20 @@ + public MpvDecoder()
+ {
+ Arrays.fill(pixels2, 0xFF505050);
++ idctfast = new IDCTFast(); +
+ idct = new IDCTRefNative();
+ idctsse = new IDCTSseNative();
++ if (IDCTFast.isLibraryLoaded()) ++ idctfast.init(); ++ +
+ if (IDCTRefNative.isLibraryLoaded())
+ idct.init();
+
+- if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
++ if (IDCTFast.isLibraryLoaded() ++ || IDCTRefNative.isLibraryLoaded() ++ || IDCTSseNative.isLibraryLoaded()) + acceleration = true;
+ }
+
+@@ -2394,7 +2401,21 @@ + //form_predictions(bx, by, macroblock_type, motion_type, PMV, motion_vertical_field_select, dmvector);
+
+
+- if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
++ if (IDCTFast.isLibraryLoaded() && isAccelerated()) ++ { ++ /* copy or add block data into picture */ ++ for (comp=0; comp<block_count; comp++) ++ { ++ /* ISO/IEC 13818-2 section Annex A: inverse DCT */ ++ idctfast.referenceIDCT(block[comp]); ++ ++ /* ISO/IEC 13818-2 section 7.6.8: Adding prediction and coefficient data */ ++ Add_Block(comp, bx, by, dct_type, (macroblock_type[0] & MACROBLOCK_INTRA)==0); ++ } ++ } ++ ++ ++ else if (IDCTSseNative.isLibraryLoaded() && isAccelerated())
+ {
+ /* copy or add block data into picture */
+ for (comp=0; comp<block_count; comp++)
+@@ -3913,4 +3934,4 @@ + ///
+
+
+-} +\ No newline at end of file ++} diff --git a/abs/extra/projectx/PKGBUILD b/abs/extra/projectx/PKGBUILD new file mode 100644 index 0000000..758df7c --- /dev/null +++ b/abs/extra/projectx/PKGBUILD @@ -0,0 +1,57 @@ +# Contributer: Sebastian Sareyko <public@nooms.de> +# +# It is possible to choose the idct implementation +# Available are: +# +# none use ProjectX Java implementation +# idct the C implementation of the source from ProjectX +# idct-ffmpeg taken from the ffmpeg Project +# idct-mjpeg taken from MJPEGTOOLS 1.8.0 +# idct-mjpeg-mmx taken from MJPEGTOOLS 1.8.0 +# +_idct=idct-mjpeg-mmx + +pkgname=projectx +pkgver=0.91.0 +pkgrel=5 +license=('GPL') +arch=('i686' 'x86_64') +pkgdesc="DVB demux tool for repairing and analyzing different stream types" +makedepends=('java-environment') +depends=('java-runtime') +url="http://sourceforge.net/projects/project-x" +source=(http://downloads.sourceforge.net/sourceforge/project-x/ProjectX_$pkgver.zip \ + IDCTFast.patch + projectx) + +md5sums=('5cf7bb227abe2c16d34e8e9c84915291' + '364022b37a55643fd8ec8d042827c3c9' + '0bb5dfb7683babb91f7fc996f5de7f2d') +build() { + cd ${srcdir} + cd Project-X_0.91.0/ + if [ ${_idct} != "none" ]; then + patch -p1 < ${srcdir}/IDCTFast.patch + unzip lib/Linux/ProjectX_Source_0.90.4-portable.zip + cp ProjectX_Source_0.90.4/src/net/sourceforge/dvb/projectx/video/IDCTFast.java src/net/sourceforge/dvb/projectx/video/ + fi + sh ./build.sh + if [ ${_idct} != "none" ]; then + cd ProjectX_Source_0.90.4/lib/PORTABLE/ + make clean + make PROJECTX_HOME=${srcdir}/Project-X_0.91.0 IDCT=${_idct} CPLAT="$CFLAGS -fPIC" + cd ${srcdir}/Project-X_0.91.0 + fi + install -D -m0755 $startdir/projectx $startdir/pkg/usr/bin/projectx + install -D -m0644 ProjectX.jar $startdir/pkg/opt/projectx/ProjectX.jar + if [ ${_idct} != "none" ]; then + install -D -m0644 ProjectX_Source_0.90.4/lib/PORTABLE/libidctfast.so \ + $startdir/pkg/opt/projectx/lib/libidctfast.so + fi + install -D -m0644 lib/commons-net-1.3.0.jar \ + $startdir/pkg/opt/projectx/lib/commons-net-1.3.0.jar + install -D -m0644 lib/jakarta-oro-2.0.8.jar \ + $startdir/pkg/opt/projectx/lib/jakarta-oro-2.0.8.jar + sed -i -e 's#Exec=java -jar /usr/share/projectx/ProjectX.jar#Exec=/usr/bin/projectx#' projectx.desktop + install -D -m0644 projectx.desktop $startdir/pkg/usr/share/applications/projectx.desktop +} diff --git a/abs/extra/projectx/projectx b/abs/extra/projectx/projectx new file mode 100644 index 0000000..1418831 --- /dev/null +++ b/abs/extra/projectx/projectx @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -d ~/.projectx ] ; then + mkdir ~/.projectx +fi + +if [ "$#" -eq 0 ] ; then + cd ~/.projectx +fi +java -Djava.library.path=/opt/projectx/lib -jar /opt/projectx/ProjectX.jar "$@" |