summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-05-02 13:20:43 +0200
committertnut <thierryn1 at hispeed dot ch>2010-05-02 13:20:43 +0200
commit149f2f1f0a64261a0bb3ecef17e8864d646ba87e (patch)
treede1a628924a80d20b4d02a8157da8ac0271a38c3
parent2c7252b70a46cdbc5363906dc370fdfd8c45d6d9 (diff)
downloadnutyx-extra-149f2f1f0a64261a0bb3ecef17e8864d646ba87e.tar.gz
nutyx-extra-149f2f1f0a64261a0bb3ecef17e8864d646ba87e.tar.bz2
nutyx-extra-149f2f1f0a64261a0bb3ecef17e8864d646ba87e.tar.xz
nutyx-extra-149f2f1f0a64261a0bb3ecef17e8864d646ba87e.zip
acidrip, ajout patch
-rw-r--r--extra/acidrip/.footprint21
-rw-r--r--extra/acidrip/.md5sum1
-rw-r--r--extra/acidrip/Pkgfile12
-rw-r--r--extra/acidrip/crop-fixes.patch21
4 files changed, 40 insertions, 15 deletions
diff --git a/extra/acidrip/.footprint b/extra/acidrip/.footprint
index 4d2a20742..a64cd49ec 100644
--- a/extra/acidrip/.footprint
+++ b/extra/acidrip/.footprint
@@ -3,16 +3,19 @@ drwxr-xr-x root/root usr/bin/
-r-xr-xr-x root/root usr/bin/acidrip
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/perl5/
+drwxr-xr-x root/root usr/lib/perl5/5.12.0/
+drwxr-xr-x root/root usr/lib/perl5/5.12.0/i686-linux-thread-multi/
drwxr-xr-x root/root usr/lib/perl5/site_perl/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.10.0/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/
--r--r--r-- root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/acidrip.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/interface.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/logo.png
--r--r--r-- root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/messages.pm
--r--r--r-- root/root usr/lib/perl5/site_perl/5.10.0/AcidRip/signals.pm
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.10.0/auto/
-drwxr-xr-x root/root usr/lib/perl5/site_perl/5.10.0/auto/AcidRip/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.12.0/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/acidrip.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/interface.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/logo.png
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/messages.pm
+-r--r--r-- root/root usr/lib/perl5/site_perl/5.12.0/AcidRip/signals.pm
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.12.0/i686-linux-thread-multi/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.12.0/i686-linux-thread-multi/auto/
+drwxr-xr-x root/root usr/lib/perl5/site_perl/5.12.0/i686-linux-thread-multi/auto/AcidRip/
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/acidrip.desktop
diff --git a/extra/acidrip/.md5sum b/extra/acidrip/.md5sum
index 27e979f3b..3d0797f6f 100644
--- a/extra/acidrip/.md5sum
+++ b/extra/acidrip/.md5sum
@@ -1,3 +1,4 @@
c1c27bbf658e5c30f43e067a8ae283de acidrip-0.14.tar.gz
7498602e2a3838cf35b94af85d9954d3 acidrip-icon4bit.png
f6896612df224a325d66c5f8fa8553e7 acidrip.desktop
+1a8470702e2e0eda8ecbc473141aa08f crop-fixes.patch
diff --git a/extra/acidrip/Pkgfile b/extra/acidrip/Pkgfile
index 0a46ec671..6b730f815 100644
--- a/extra/acidrip/Pkgfile
+++ b/extra/acidrip/Pkgfile
@@ -2,22 +2,22 @@
# URL: http://untrepid.com/acidrip/
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: mplayer, lame, libdvdcss, p5-gtk, lsdvd
+# Depends on: mplayer, lame, libdvdcss, p5-gtk, lsdvd, mplayer
name=acidrip
version=0.14
release=1
-perlVer=5.10.0
+perlVer=5.12.0
source=(http://switch.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz\
- acidrip.desktop\
+ acidrip.desktop crop-fixes.patch\
http://untrepid.com/acidrip/acidrip-icon4bit.png)
build() {
cd $name-$version
+ patch -up1 < ../crop-fixes.patch
perl Makefile.PL \
- INSTALLARCHLIB=/usr/lib/perl5/$perlV/$archname \
- INSTALLSITELIB=/usr/lib/perl5/site_perl/$perlVer \
- INSTALLSITEARCH=/usr/lib/perl5/site_perl/$perlVer/$archname
+ INSTALLSITELIB=/usr/lib/perl5/site_perl/$perlVer
+
sed -i "s%^DESTDIR.*%DESTDIR=$PKG%" Makefile
make
make DESTDIR=$PKG install
diff --git a/extra/acidrip/crop-fixes.patch b/extra/acidrip/crop-fixes.patch
new file mode 100644
index 000000000..4a856180f
--- /dev/null
+++ b/extra/acidrip/crop-fixes.patch
@@ -0,0 +1,21 @@
+diff -ur acidrip-0.14/AcidRip/acidrip.pm acidrip-0.14-cropfixes/AcidRip/acidrip.pm
+--- acidrip-0.14/AcidRip/acidrip.pm 2004-07-25 09:03:09.000000000 -0500
++++ acidrip-0.14-cropfixes/AcidRip/acidrip.pm 2007-02-12 15:05:36.000000000 -0600
+@@ -680,7 +680,7 @@
+ message( "Running " . get_command("cropdetect") );
+ open( CROP, get_command("cropdetect") . " 2>&1 |" );
+ while (<CROP>) {
+- if ( $_ =~ /crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
++ if ( $_ =~ /[cC]rop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
+ $crop_output .= $_;
+ gui_check($_);
+ }
+@@ -863,7 +863,7 @@
+ if ( $::settings->{'mencoder_pid'} = open( MENCODER, "$menc 2>&1 |" ) ) {
+ $/ = "\r";
+ while (<MENCODER>) {
+- if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
++ if (/^Pos:\s*(\d+)\.\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+([\d.]+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
+ if ( $1 ne $sec ) { $sec = $1; $::widgets->{'menc_seconds'}->set_text( hhmmss($1) ) }
+ if ( $4 ne $fps ) { $fps = $4; $::widgets->{'menc_fps'}->set_text($4) }
+ if ( $6 ne $size ) { $size = $6; $::widgets->{'menc_filesize'}->set_text($6) }