From b57ed162489566120639f6f53fc854cc472c6ca6 Mon Sep 17 00:00:00 2001 From: Michael Hanson <hansonorders@verizon.net> Date: Fri, 12 Nov 2010 00:07:27 +0000 Subject: More file cleanups --- abs/core/mjpegtools/1.9.patch | 147 -------------------- abs/core/mjpegtools/mjpegtools-1.8.0-gcc41.patch | 12 -- abs/core/mjpegtools/mjpegtools-1.8.0-libc.patch | 154 --------------------- .../mjpegtools/mjpegtools-1.8.0-limits.h.patch | 30 ---- abs/core/sdl/sdl-1.2.13-dynaminc-esd.patch | 12 -- abs/extra/gpac/ChangeLog | 9 -- abs/extra/gpac/PKGBUILD | 27 ---- abs/extra/gpac/gpac-0.4.2-ffmpeg-errno.patch | 20 --- abs/extra/mythnuv2mkv/PKGBUILD | 16 --- abs/extra/mythnuv2mkv/mythnuv2mkv.patch | 36 ----- 10 files changed, 463 deletions(-) delete mode 100644 abs/core/mjpegtools/1.9.patch delete mode 100644 abs/core/mjpegtools/mjpegtools-1.8.0-gcc41.patch delete mode 100644 abs/core/mjpegtools/mjpegtools-1.8.0-libc.patch delete mode 100644 abs/core/mjpegtools/mjpegtools-1.8.0-limits.h.patch delete mode 100644 abs/core/sdl/sdl-1.2.13-dynaminc-esd.patch delete mode 100644 abs/extra/gpac/ChangeLog delete mode 100755 abs/extra/gpac/PKGBUILD delete mode 100755 abs/extra/gpac/gpac-0.4.2-ffmpeg-errno.patch delete mode 100644 abs/extra/mythnuv2mkv/PKGBUILD delete mode 100644 abs/extra/mythnuv2mkv/mythnuv2mkv.patch diff --git a/abs/core/mjpegtools/1.9.patch b/abs/core/mjpegtools/1.9.patch deleted file mode 100644 index ae3fc90..0000000 --- a/abs/core/mjpegtools/1.9.patch +++ /dev/null @@ -1,147 +0,0 @@ -http://bugs.gentoo.org/200767 -http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776 - ---- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h -+++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h -@@ -25,6 +25,8 @@ - */ - - -+#include <stdlib.h> -+ - class Parity - { - public: ---- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc -+++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc -@@ -21,6 +21,7 @@ - - #include <stdio.h> - #include <cassert> -+#include <limits.h> - - #include "macroblock.hh" - #include "mpeg2syntaxcodes.h" ---- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc -+++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc -@@ -23,6 +23,7 @@ - #include "picturereader.hh" - #include "mpeg2encoder.hh" - #include "imageplanes.hh" -+#include <limits.h> - //#include <stdio.h> - //#include <stdlib.h> - //#include <unistd.h> ---- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp -+++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp -@@ -23,6 +23,7 @@ - - #include <config.h> - #include <assert.h> -+#include <limits.h> - - #include "mjpeg_types.h" - #include "inputstrm.hpp" ---- mjpegtools-1.9.0rc3/mplex/padstrm.cpp -+++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include <string.h> - #include "padstrm.hpp" - - ---- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp -+++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp -@@ -22,6 +22,7 @@ - #include <config.h> - #include <math.h> - #include <stdlib.h> -+#include <string.h> - - #include <mjpeg_types.h> - #include <mjpeg_logging.h> ---- mjpegtools-1.9.0rc3/mplex/main.cpp -+++ mjpegtools-1.9.0rc3/mplex/main.cpp -@@ -31,6 +31,7 @@ - #include <getopt.h> - #endif - #include <string> -+#include <string.h> - #include <memory> - #include <sys/stat.h> - #ifndef _WIN32 ---- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh -+++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh -@@ -23,7 +23,7 @@ - // How we implement ourselves. - - public: -- typedef typename Imp::Allocator Allocator; -+ typedef typename Imp::Allocator_t Allocator; - // The type of allocator to use to allocate items in the set. - - Set (const PRED &a_rPred = PRED(), ---- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh -+++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh -@@ -57,19 +57,19 @@ - // Will give good sorting for up to e^10 items. - - public: -- typedef Allocator<Node,HEADERCHUNK> Allocator; -+ typedef Allocator<Node,HEADERCHUNK> Allocator_t; - // The type of node allocator to use. - -- static Allocator sm_oNodeAllocator; -+ static Allocator_t sm_oNodeAllocator; - // The default node allocator. - - SkipList (const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Default constructor. Must be followed by Init(). - - SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates, - uint32_t a_nRandSeed, const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Constructor. Specify whether or not duplicates are allowed, - // and provide a random number seed. - -@@ -255,7 +255,7 @@ - - private: - -- Allocator &m_rNodeAllocator; -+ Allocator_t &m_rNodeAllocator; - // Where we get memory to allocate nodes. - - bool m_bAllowDuplicates; -@@ -337,7 +337,7 @@ - - // The default node allocator. Allocates 64K at a time. - template <class KEY, class VALUE, class KEYFN, class PRED> --typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator -+typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t - SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); - - -@@ -345,7 +345,7 @@ - // Default constructor. Must be followed by Init(). - template <class KEY, class VALUE, class KEYFN, class PRED> - SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred, -- Allocator &a_rAlloc) -+ Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Set up some defaults. -@@ -371,7 +371,7 @@ - template <class KEY, class VALUE, class KEYFN, class PRED> - SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus, - bool a_bAllowDuplicates, uint32_t a_nRandSeed, -- const PRED &a_rPred, Allocator &a_rAlloc) -+ const PRED &a_rPred, Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Make sure they didn't start us off with an error. diff --git a/abs/core/mjpegtools/mjpegtools-1.8.0-gcc41.patch b/abs/core/mjpegtools/mjpegtools-1.8.0-gcc41.patch deleted file mode 100644 index 77d556f..0000000 --- a/abs/core/mjpegtools/mjpegtools-1.8.0-gcc41.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh ---- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh 2005-12-19 12:36:54.000000000 +0300 -+++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh 2005-12-19 12:44:36.000000000 +0300 -@@ -16,7 +16,7 @@ - - #include "Status_t.h" - #include <iostream> -- -+#include <cassert> - - - // The 2-dimensional region class. Parameterized by the numeric type diff --git a/abs/core/mjpegtools/mjpegtools-1.8.0-libc.patch b/abs/core/mjpegtools/mjpegtools-1.8.0-libc.patch deleted file mode 100644 index 7cffada..0000000 --- a/abs/core/mjpegtools/mjpegtools-1.8.0-libc.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h mjpegtools-1.8.0/mpeg2enc/encodertypes.h ---- mjpegtools-1.8.0.orig/mpeg2enc/encodertypes.h 2008-12-10 10:57:56.000000000 -0600 -+++ mjpegtools-1.8.0/mpeg2enc/encodertypes.h 2008-12-10 11:02:08.000000000 -0600 -@@ -26,7 +26,7 @@ - - #include "config.h" - -- -+#include <stdlib.h> - - class Parity - { -diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc mjpegtools-1.8.0/mpeg2enc/macroblock.cc ---- mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc 2008-12-10 10:57:56.000000000 -0600 -+++ mjpegtools-1.8.0/mpeg2enc/macroblock.cc 2008-12-10 11:02:41.000000000 -0600 -@@ -20,6 +20,7 @@ - */ - - #include <stdio.h> -+#include <limits.h> - - #include "macroblock.hh" - #include "mpeg2syntaxcodes.h" -diff -Naur mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc mjpegtools-1.8.0/mpeg2enc/picturereader.cc ---- mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc 2008-12-10 10:57:56.000000000 -0600 -+++ mjpegtools-1.8.0/mpeg2enc/picturereader.cc 2008-12-10 11:03:04.000000000 -0600 -@@ -25,6 +25,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <string.h> -+#include <limits.h> - #include <errno.h> - #include "simd.h" - #include "mpeg2encoder.hh" -diff -Naur mjpegtools-1.8.0.orig/mplex/inputstrm.cpp mjpegtools-1.8.0/mplex/inputstrm.cpp ---- mjpegtools-1.8.0.orig/mplex/inputstrm.cpp 2008-12-10 10:58:55.000000000 -0600 -+++ mjpegtools-1.8.0/mplex/inputstrm.cpp 2008-12-10 11:03:36.000000000 -0600 -@@ -23,6 +23,7 @@ - - #include <config.h> - #include <assert.h> -+#include <limits.h> - - #include "mjpeg_types.h" - #include "inputstrm.hpp" -diff -Naur mjpegtools-1.8.0.orig/mplex/padstrm.cpp mjpegtools-1.8.0/mplex/padstrm.cpp ---- mjpegtools-1.8.0.orig/mplex/padstrm.cpp 2008-12-10 10:58:55.000000000 -0600 -+++ mjpegtools-1.8.0/mplex/padstrm.cpp 2008-12-10 11:04:06.000000000 -0600 -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include <string.h> - #include "padstrm.hpp" - - -diff -Naur mjpegtools-1.8.0.orig/mplex/multiplexor.cpp mjpegtools-1.8.0/mplex/multiplexor.cpp ---- mjpegtools-1.8.0.orig/mplex/multiplexor.cpp 2008-12-10 10:58:55.000000000 -0600 -+++ mjpegtools-1.8.0/mplex/multiplexor.cpp 2008-12-10 11:04:53.000000000 -0600 -@@ -22,6 +22,7 @@ - #include <config.h> - #include <math.h> - #include <stdlib.h> -+#include <string.h> - - #include <mjpeg_types.h> - #include <mjpeg_logging.h> -diff -Naur mjpegtools-1.8.0.orig/mplex/main.cpp mjpegtools-1.8.0/mplex/main.cpp ---- mjpegtools-1.8.0.orig/mplex/main.cpp 2008-12-10 10:58:55.000000000 -0600 -+++ mjpegtools-1.8.0/mplex/main.cpp 2008-12-10 11:05:20.000000000 -0600 -@@ -31,6 +31,7 @@ - #include <getopt.h> - #endif - #include <string> -+#include <string.h> - #include <memory> - #include <sys/stat.h> - #ifndef _WIN32 -diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/Set.hh mjpegtools-1.8.0/y4mdenoise/Set.hh ---- mjpegtools-1.8.0.orig/y4mdenoise/Set.hh 2008-12-10 11:00:49.000000000 -0600 -+++ mjpegtools-1.8.0/y4mdenoise/Set.hh 2008-12-10 11:06:30.000000000 -0600 -@@ -23,7 +23,7 @@ - // How we implement ourselves. - - public: -- typedef typename Imp::Allocator Allocator; -+ typedef typename Imp::Allocator_t Allocator; - // The type of allocator to use to allocate items in the set. - - Set (const PRED &a_rPred = PRED(), -diff -Naur mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh mjpegtools-1.8.0/y4mdenoise/SkipList.hh ---- mjpegtools-1.8.0.orig/y4mdenoise/SkipList.hh 2008-12-10 11:00:49.000000000 -0600 -+++ mjpegtools-1.8.0/y4mdenoise/SkipList.hh 2008-12-10 11:09:34.000000000 -0600 -@@ -57,19 +57,19 @@ - // Will give good sorting for up to e^10 items. - - public: -- typedef Allocator<Node,HEADERCHUNK> Allocator; -+ typedef Allocator<Node,HEADERCHUNK> Allocator_t; - // The type of node allocator to use. - -- static Allocator sm_oNodeAllocator; -+ static Allocator_t sm_oNodeAllocator; - // The default node allocator. - - SkipList (const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Default constructor. Must be followed by Init(). - - SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates, - uint32_t a_nRandSeed, const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Constructor. Specify whether or not duplicates are allowed, - // and provide a random number seed. - -@@ -255,7 +255,7 @@ - - private: - -- Allocator &m_rNodeAllocator; -+ Allocator_t &m_rNodeAllocator; - // Where we get memory to allocate nodes. - - bool m_bAllowDuplicates; -@@ -337,7 +337,7 @@ - - // The default node allocator. Allocates 64K at a time. - template <class KEY, class VALUE, class KEYFN, class PRED> --typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator -+typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t - SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); - - -@@ -345,7 +345,7 @@ - // Default constructor. Must be followed by Init(). - template <class KEY, class VALUE, class KEYFN, class PRED> - SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred, -- Allocator &a_rAlloc) -+ Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Set up some defaults. -@@ -371,7 +371,7 @@ - template <class KEY, class VALUE, class KEYFN, class PRED> - SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus, - bool a_bAllowDuplicates, uint32_t a_nRandSeed, -- const PRED &a_rPred, Allocator &a_rAlloc) -+ const PRED &a_rPred, Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Make sure they didn't start us off with an error. - diff --git a/abs/core/mjpegtools/mjpegtools-1.8.0-limits.h.patch b/abs/core/mjpegtools/mjpegtools-1.8.0-limits.h.patch deleted file mode 100644 index 41a59ca..0000000 --- a/abs/core/mjpegtools/mjpegtools-1.8.0-limits.h.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc 2007-11-29 19:45:06 +0000 -+++ mjpegtools-1.8.0.orig/mpeg2enc/macroblock.cc 2007-11-29 19:45:33 +0000 -@@ -20,6 +20,7 @@ - */ - - #include <stdio.h> -+#include <limits.h> - - #include "macroblock.hh" - #include "mpeg2syntaxcodes.h" ---- mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc 2007-11-29 19:45:06 +0000 -+++ mjpegtools-1.8.0.orig/mpeg2enc/picturereader.cc 2007-11-29 19:45:52 +0000 -@@ -26,6 +26,7 @@ - #include <unistd.h> - #include <string.h> - #include <errno.h> -+#include <limits.h> - #include "simd.h" - #include "mpeg2encoder.hh" - ---- mjpegtools-1.8.0.orig/mplex/inputstrm.cpp 2007-11-29 19:45:06 +0000 -+++ mjpegtools-1.8.0.orig/mplex/inputstrm.cpp 2007-11-29 19:46:15 +0000 -@@ -23,6 +23,7 @@ - - #include <config.h> - #include <assert.h> -+#include <limits.h> - - #include "mjpeg_types.h" - #include "inputstrm.hpp" diff --git a/abs/core/sdl/sdl-1.2.13-dynaminc-esd.patch b/abs/core/sdl/sdl-1.2.13-dynaminc-esd.patch deleted file mode 100644 index 3dab5fc..0000000 --- a/abs/core/sdl/sdl-1.2.13-dynaminc-esd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur SDL-1.2.13-old/configure SDL-1.2.13/configure ---- SDL-1.2.13-old/configure 2007-12-31 15:09:39.000000000 +1000 -+++ SDL-1.2.13/configure 2008-10-20 22:22:36.000000000 +1000 -@@ -25382,7 +25382,7 @@ - enable_esd_shared=yes - fi - -- esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'` -+ esd_lib_spec="/usr/lib/libesd.so.*" - esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` - echo "-- $esd_lib_spec -> $esd_lib" - diff --git a/abs/extra/gpac/ChangeLog b/abs/extra/gpac/ChangeLog deleted file mode 100644 index 5e63198..0000000 --- a/abs/extra/gpac/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2009-04-19 Allan McRae <allan@archlinux.org> - * gpac-0.4.5-2 - * Rebuild against libavcodec.so.52 (FS#14291) - -2008-12-14 Allan McRae <allan@archlinux.org> - * gpac-0.4.5-1 - * upstream update - * FHS man page - diff --git a/abs/extra/gpac/PKGBUILD b/abs/extra/gpac/PKGBUILD deleted file mode 100755 index 04ce3cc..0000000 --- a/abs/extra/gpac/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD,v 1.4 2009/04/19 08:06:33 allan Exp $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: niQo - -pkgname=gpac -pkgver=0.4.5 -pkgrel=4 -pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" -arch=('i686' 'x86_64') -url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'spidermonkey' 'libmad' \ - 'faad2' 'xvidcore' 'ffmpeg' 'freeglut' 'libjpeg') -license=('LGPL') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('755e8c438a48ebdb13525dd491f5b0d1') - -build() { - cd "${srcdir}/${pkgname}" - chmod +x configure - sed -i 's#osmozilla##g' applications/Makefile - sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile - sed -i 's#ldconfig || true##g' Makefile - ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make || return 1 - make DESTDIR=${pkgdir}/ install-lib - make DESTDIR=${pkgdir}/ install -} diff --git a/abs/extra/gpac/gpac-0.4.2-ffmpeg-errno.patch b/abs/extra/gpac/gpac-0.4.2-ffmpeg-errno.patch deleted file mode 100755 index ec59cec..0000000 --- a/abs/extra/gpac/gpac-0.4.2-ffmpeg-errno.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gpac/modules/ffmpeg_in/ffmpeg_demux.c -=================================================================== ---- gpac.orig/modules/ffmpeg_in/ffmpeg_demux.c -+++ gpac/modules/ffmpeg_in/ffmpeg_demux.c -@@ -23,6 +23,7 @@ - */ - - #include "ffmpeg_in.h" -+#include <errno.h> - - /*default buffer is 200 ms per channel*/ - #define FFD_DATA_BUFFER 800 -@@ -285,7 +286,6 @@ static GF_ESD *FFD_GetESDescriptor(FFDem - case CODEC_ID_MP3: - esd->decoderConfig->objectTypeIndication = 0x69; - break; -- case CODEC_ID_MPEG4AAC: - case CODEC_ID_AAC: - if (!dec->extradata_size) goto opaque_audio; - esd->decoderConfig->objectTypeIndication = 0x40; diff --git a/abs/extra/mythnuv2mkv/PKGBUILD b/abs/extra/mythnuv2mkv/PKGBUILD deleted file mode 100644 index 5df33a7..0000000 --- a/abs/extra/mythnuv2mkv/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=mythnuv2mkv -pkgver=1.60 -pkgrel=1 -conflicts=() -pkgdesc="Converts MythTV nuv or mpg files to mkv, mp4 or avi files. It can be run as a MythTV User Job or at command line to convert MythTV recordings or stand alone files." -depends=(perl mplayer wget bc imagemagick lame x264 faac faad2 mkvtoolnix vorbis-tools gpac ) -arch=('i686') -license=('GPL') -source=(http://web.aanet.com.au/~auric/files2/V${pkgver}/mythnuv2mkv.sh) - -build() { - patch -p0 <$startdir/mythnuv2mkv.patch || return 1 - mkdir -p $startdir/pkg/usr/bin - install -m 0755 mythnuv2mkv.sh $startdir/pkg/usr/bin/mythnuv2mkv.sh -} -md5sums=('19a5c8bed9bd7d6a86d35e96afa4b3bb') diff --git a/abs/extra/mythnuv2mkv/mythnuv2mkv.patch b/abs/extra/mythnuv2mkv/mythnuv2mkv.patch deleted file mode 100644 index 5ca20ae..0000000 --- a/abs/extra/mythnuv2mkv/mythnuv2mkv.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- mythnuv2mkv.sh.orig 2010-04-21 01:41:11.000000000 +0000 -+++ mythnuv2mkv.sh 2010-04-21 01:43:04.000000000 +0000 -@@ -7,19 +7,19 @@ - # - ######### Vars you may want to set for your environment ###################################################### - # Default aspect for Myth Recording mpg files. It will try to work it out but if it can't will use this. --readonly DEFAULTMPEG2ASPECT="NA" # 4:3 or 16:9 -+readonly DEFAULTMPEG2ASPECT="16:9" # 4:3 or 16:9 - # Log directory --readonly LOGBASEDIR="/var/tmp" # Don't use a directory with spaces in it's name -+readonly LOGBASEDIR="/tmp" # Don't use a directory with spaces in it's name - # Number of errors reported by mplayer allowed in the transcoded file - readonly MPLAYER_ERROR_COUNT="8" - # Path to your mysql.txt file - readonly MYSQLTXT="" - # What to separate Title SeasonEpisode SubTitle with --readonly SEP="," -+readonly SEP="_" - # Chapter marks every X minutes --CHAPTERDURATION=0 -+CHAPTERDURATION=5 - # Crop input --CROP="ON" # ON | OFF, can also change with --crop argument -+CROP="OFF" # ON | OFF, can also change with --crop argument - CROPSIZE=8 - # Delete recording after successful transcode. Only for transcode out of MythRecording. (Actually just sets to high priority autoexpire.) - DELETEREC="OFF" # ON | OFF, can also change with --deleterec argument -@@ -29,7 +29,7 @@ - DEBLOCK="OFF" # ON | OFF, can also change with --deblock argument - # Include deinterlace filter. - # SOURCENAME is ON for that source. Can have multiple. e.g. DEINTERLACE="Cabel,FTA1" --DEINTERLACE="ON" # ON | OFF | SOURCENAME,SOURCENAME can also change with --deinterlace argument. -+DEINTERLACE="OFF" # ON | OFF | SOURCENAME,SOURCENAME can also change with --deinterlace argument. - # Include inverse Telecine filter (Experimental. Can someone from NTSC/ATSC land try this?). - # invtelecine filter is never added if deinterlace has been added. - INVTELECINE="OFF" # ON | OFF, can also change with --invtelecine argument. -- cgit v0.12