Now option to not run noad when there are already marks there. Cleaned up noad-wrappe...
authorMatthias Schwarzott <zzam@gentoo.org>
Thu, 28 Dec 2006 20:02:01 +0000 (20:02 +0000)
committerMatthias Schwarzott <zzam@gentoo.org>
Thu, 28 Dec 2006 20:02:01 +0000 (20:02 +0000)
Package-Manager: portage-2.1.2_rc4-r1

media-video/noad/ChangeLog
media-video/noad/Manifest
media-video/noad/files/0.6.0-r7/confd_vdraddon.noad [new file with mode: 0644]
media-video/noad/files/0.6.0-r7/noad-reccmd [new file with mode: 0644]
media-video/noad/files/0.6.0-r7/reccmds.noad.conf [new file with mode: 0644]
media-video/noad/files/0.6.0-r7/record-50-noad.sh [new file with mode: 0644]
media-video/noad/files/digest-noad-0.6.0-r7 [new file with mode: 0644]
media-video/noad/noad-0.6.0-r7.ebuild [new file with mode: 0644]

index 9aabcab4f6ce05d019b3bda6634ac5e166a368ac..ce07944a903062188d4a0f3c434118fd7251185f 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.14 2006/11/09 10:51:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.15 2006/12/28 20:02:01 zzam Exp $
+
+*noad-0.6.0-r7 (28 Dec 2006)
+
+  28 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.6.0-r7/record-50-noad.sh, +files/0.6.0-r7/confd_vdraddon.noad,
+  +files/0.6.0-r7/noad-reccmd, +files/0.6.0-r7/reccmds.noad.conf,
+  +noad-0.6.0-r7.ebuild:
+  Now option to not run noad when there are already marks there. Cleaned up
+  noad-wrapper-script a bit.
 
   09 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> noad-0.6.0-r4.ebuild,
   noad-0.6.0-r5.ebuild, noad-0.6.0-r6.ebuild:
index 6a5333b3b04929714194ed0c84c86cd83ba9ea6b..dea91cf4cb8f7376508daa84f9b6a736a54c56d9 100644 (file)
@@ -33,6 +33,22 @@ AUX 0.6.0-r5/record-50-noad.sh 1280 RMD160 3cecff39403c6d7a4cf22736534873c69505b
 MD5 8a37f935434e52b3a1ae733d1b935c12 files/0.6.0-r5/record-50-noad.sh 1280
 RMD160 3cecff39403c6d7a4cf22736534873c69505b0fd files/0.6.0-r5/record-50-noad.sh 1280
 SHA256 9df8d54663eba19774533ccfd9b0e8516cde5c6cb36dbd4f43de6f0d1d5222b7 files/0.6.0-r5/record-50-noad.sh 1280
+AUX 0.6.0-r7/confd_vdraddon.noad 1377 RMD160 1cbcb6f5a3c6307a0b7516e22072ce905ebd81c6 SHA1 84dd50b71c1df38be217d8b469d0a2f7cd7636b0 SHA256 13e4ef0ef59c2a6138c55be359eaed876991fef0f5fe664597ea815686a1e854
+MD5 71d60871f0b4d66591abeb939e2bd4f4 files/0.6.0-r7/confd_vdraddon.noad 1377
+RMD160 1cbcb6f5a3c6307a0b7516e22072ce905ebd81c6 files/0.6.0-r7/confd_vdraddon.noad 1377
+SHA256 13e4ef0ef59c2a6138c55be359eaed876991fef0f5fe664597ea815686a1e854 files/0.6.0-r7/confd_vdraddon.noad 1377
+AUX 0.6.0-r7/noad-reccmd 152 RMD160 b30fdf88b2ed0547f14a9ba163fba0a05c368ff2 SHA1 c2e493a3c5fbfeb385e7986ff68a47909c42b9a9 SHA256 4d25751987bb50677eb3909d23a3c820bbd8aeaef4aac383baff855082dab7c0
+MD5 6ed00f1a29658d3d9525a7fc5edff6f6 files/0.6.0-r7/noad-reccmd 152
+RMD160 b30fdf88b2ed0547f14a9ba163fba0a05c368ff2 files/0.6.0-r7/noad-reccmd 152
+SHA256 4d25751987bb50677eb3909d23a3c820bbd8aeaef4aac383baff855082dab7c0 files/0.6.0-r7/noad-reccmd 152
+AUX 0.6.0-r7/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
+MD5 4524974857d07e15856410a1001a2817 files/0.6.0-r7/reccmds.noad.conf 61
+RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f files/0.6.0-r7/reccmds.noad.conf 61
+SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d files/0.6.0-r7/reccmds.noad.conf 61
+AUX 0.6.0-r7/record-50-noad.sh 1484 RMD160 7b4b5785a4e5eef5c878b33275678eaf99cc15b6 SHA1 d1c1b738e9a31df41a9c64c6a3f60862a3ca36ce SHA256 f54755dc116f3a9a2da7fdbd7c4fa47bea269bf6d847b032027b6114009a4dbe
+MD5 836d0353e0416c2b1afbb2182111d5a3 files/0.6.0-r7/record-50-noad.sh 1484
+RMD160 7b4b5785a4e5eef5c878b33275678eaf99cc15b6 files/0.6.0-r7/record-50-noad.sh 1484
+SHA256 f54755dc116f3a9a2da7fdbd7c4fa47bea269bf6d847b032027b6114009a4dbe files/0.6.0-r7/record-50-noad.sh 1484
 AUX noad-0.6.0-as-needed.diff 978 RMD160 d6c74670793b76f5cc9f3ea740b001a9034c5b2a SHA1 83885096cfe13c28912fe69afd9d708f9e22caf4 SHA256 a4f8cbdeeba303ab659bafc75f5d622b1ceec6945d3c35e4f0c559d3504e8ed9
 MD5 b2af6d077e29ad03e2d5ce1c8b36ec04 files/noad-0.6.0-as-needed.diff 978
 RMD160 d6c74670793b76f5cc9f3ea740b001a9034c5b2a files/noad-0.6.0-as-needed.diff 978
@@ -86,10 +102,14 @@ EBUILD noad-0.6.0-r6.ebuild 2104 RMD160 2f7a8db4ed93393cb7a390586022fdcc8aeba152
 MD5 eedc1c9606be369c768af92c6702c934 noad-0.6.0-r6.ebuild 2104
 RMD160 2f7a8db4ed93393cb7a390586022fdcc8aeba152 noad-0.6.0-r6.ebuild 2104
 SHA256 2d4f073f83ec9b033e36708392aa56f9ac79ef3f5632c449c5264ffc18c4e3fb noad-0.6.0-r6.ebuild 2104
-MISC ChangeLog 3033 RMD160 d54ed0da95cbe5a2d3fa81a59e734a05712be2c8 SHA1 c84f074da46ab3dad3bf2d03967eb9d93b1c9e41 SHA256 4c1ea29c16f72225022e7599120a054e3bb077db1839d3e445ee6685b9ff8a0d
-MD5 199f91256f5b6cfc79656110bdf83e0a ChangeLog 3033
-RMD160 d54ed0da95cbe5a2d3fa81a59e734a05712be2c8 ChangeLog 3033
-SHA256 4c1ea29c16f72225022e7599120a054e3bb077db1839d3e445ee6685b9ff8a0d ChangeLog 3033
+EBUILD noad-0.6.0-r7.ebuild 2105 RMD160 390195d02119403cf990e6f79b88df0beed36e90 SHA1 85ac041e93c6ee6a4e5c904310fbff22e85e6b2a SHA256 69dd252e3516bffeca1716d39211062f958573d5f07ff86331aa6630323c60e5
+MD5 dd476e74c3c5da6d83c04a61c27d87dd noad-0.6.0-r7.ebuild 2105
+RMD160 390195d02119403cf990e6f79b88df0beed36e90 noad-0.6.0-r7.ebuild 2105
+SHA256 69dd252e3516bffeca1716d39211062f958573d5f07ff86331aa6630323c60e5 noad-0.6.0-r7.ebuild 2105
+MISC ChangeLog 3387 RMD160 5387ffacc51de7fe6667c8a44991642294ce14c1 SHA1 6408fe04377f6d8ec4ceb9634c01934df986cb02 SHA256 ea94ba1f7a119a8aaaf744fcf2effd14dcc536c72f16250833d70367f325a30c
+MD5 fe87638f52459a1e2a3b5bafb3695427 ChangeLog 3387
+RMD160 5387ffacc51de7fe6667c8a44991642294ce14c1 ChangeLog 3387
+SHA256 ea94ba1f7a119a8aaaf744fcf2effd14dcc536c72f16250833d70367f325a30c ChangeLog 3387
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -106,10 +126,13 @@ SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/di
 MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r6 235
 RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r6 235
 SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r6 235
+MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r7 235
+RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r7 235
+SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r7 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFUwhTt2vP6XvVdOcRAufTAJ4pmFADFb/DpJ9XlX515pUKzZ8FDgCfRzuT
-zuq7IeJjlxLKY2wRK0zNI58=
-=YAet
+iD8DBQFFlCLEt2vP6XvVdOcRAvzCAKC1cDn5eFspXuMQHLpZVewk5oVbaACfbH7z
+s7b4aqhzvP6EMoBmxINJDyc=
+=TeNq
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad b/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad
new file mode 100644 (file)
index 0000000..6cb3d80
--- /dev/null
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r7/confd_vdraddon.noad,v 1.1 2006/12/28 20:02:01 zzam Exp $
+
+#########
+##
+#      run Noad
+#      available Parameter
+#      no | yes
+#
+VDR_USE_NOAD="yes"
+
+##     do online scan while recording
+#      you can choose between
+#              no   - disable online scan
+#              live - scan only live recordings online (named @...)
+#              all  - scan all recordings with online mode
+#      available Parameter
+#      no | live | all
+#
+NOAD_ONLINE="no"
+
+##     start noad with nice
+#      available Parameter
+#      yes | no
+NOAD_NICE="yes"
+
+##     use ac3 detection
+#      available Parameter
+#      yes | no
+#
+NOAD_AC3="yes"
+
+##     detect jumping logos
+#      available Parameter
+#      yes | no
+#
+NOAD_JUMP="yes"
+
+##     detect overlaps
+#      available Parameter
+#      yes | no
+#
+NOAD_OVERLAP="yes"
+
+##     send an OSD-Message to localhost:2001 for start and end 
+#      available Parameter
+#      yes | no
+#
+NOAD_MESSAGES="yes"
+
+##     only scan if sharemarks did not produce an ptsmarks.vdr file
+#      available Parameter
+#      yes | no
+NOAD_ONLY_SCAN_IF_NO_PTSMARKS="yes"
+
+##     only scan if there are no cut-marks already there (cutting while vdr still records)
+#      available Parameter
+#      yes | no
+NOAD_ONLY_SCAN_IF_NO_MARKS="yes"
+
+##     add your own parameter here,
+#      yust run 'noad' in konsole for more parameter
+NOAD_PARAMETER=""
+
+
+
+
+
+
diff --git a/media-video/noad/files/0.6.0-r7/noad-reccmd b/media-video/noad/files/0.6.0-r7/noad-reccmd
new file mode 100644 (file)
index 0000000..069a292
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+VDR_RECORD_STATE=reccmd
+VDR_RECORD_NAME="${1}"
+
+source /usr/share/vdr/record/record-50-noad.sh "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}"
+
diff --git a/media-video/noad/files/0.6.0-r7/reccmds.noad.conf b/media-video/noad/files/0.6.0-r7/reccmds.noad.conf
new file mode 100644 (file)
index 0000000..5d35495
--- /dev/null
@@ -0,0 +1 @@
+Scan for Commercials (noad)            :/usr/share/vdr/bin/noad-reccmd
diff --git a/media-video/noad/files/0.6.0-r7/record-50-noad.sh b/media-video/noad/files/0.6.0-r7/record-50-noad.sh
new file mode 100644 (file)
index 0000000..da1847c
--- /dev/null
@@ -0,0 +1,65 @@
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/files/0.6.0-r7/record-50-noad.sh,v 1.1 2006/12/28 20:02:01 zzam Exp $
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+# Mathias Schwarzott <zzam@gentoo.org>
+#
+
+source /etc/conf.d/vdraddon.noad
+
+CMD="/usr/bin/noad"
+
+# Parameter to start NoAd
+# parameter are "no | yes"
+
+FORCE_OFFLINE_SCAN=no
+
+if [[ ${VDR_RECORD_STATE} == reccmd ]]; then
+       # script started from reccmd
+       FORCE_OFFLINE_SCAN=yes
+       VDR_RECORD_STATE=after
+fi
+
+
+if [[ ${FORCE_OFFLINE_SCAN} != yes ]]; then
+       # allow it to abort on certain conditions
+
+       # automatic noad scan disabled
+       [[ ${VDR_USE_NOAD} == "yes" ]] || return
+
+       # ptsmarks existing
+       if [[ ${NOAD_ONLY_SCAN_IF_NO_PTSMARKS} == yes ]]; then
+               [[ -f ${VDR_RECORD_NAME}/ptsmarks.vdr ]] && return
+       fi
+
+       # marks existing
+       if [[ ${NOAD_ONLY_SCAN_IF_NO_MARKS} == yes ]]; then
+               [[ -f ${VDR_RECORD_NAME}/marks.vdr ]] && return
+       fi
+
+       # Add Online-scanning parameter
+       case "${NOAD_ONLINE}" in
+               live|yes)
+                       CMD="${CMD} --online=1"
+                       ;;
+               all)
+                       CMD="${CMD} --online=2"
+                       ;;
+               no)
+                       # abort stage "before" here
+                       [[ ${VDR_RECORD_STATE} == "before" ]] && return
+                       ;;
+       esac
+fi
+
+[[ "${NOAD_AC3}" == "yes" ]] && CMD="${CMD} -a"
+[[ "${NOAD_JUMP}" == "yes" ]] && CMD="${CMD} -j"
+[[ "${NOAD_OVERLAP}" == "yes" ]] && CMD="${CMD} -o"
+[[ "${NOAD_MESSAGES}" == "yes" ]] && CMD="${CMD} -O"
+
+if [[ ${NOAD_NICE} == yes ]]; then
+       CMD="nice ${CMD}"
+fi
+
+CMD="${CMD} ${NOAD_PARAMETER}"
+${CMD} "${VDR_RECORD_STATE}" "${VDR_RECORD_NAME}" 
+
diff --git a/media-video/noad/files/digest-noad-0.6.0-r7 b/media-video/noad/files/digest-noad-0.6.0-r7
new file mode 100644 (file)
index 0000000..05e249e
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
+RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
+SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/noad-0.6.0-r7.ebuild b/media-video/noad/noad-0.6.0-r7.ebuild
new file mode 100644 (file)
index 0000000..13dad6d
--- /dev/null
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r7.ebuild,v 1.1 2006/12/28 20:02:01 zzam Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Mark commercial Breaks in VDR records"
+HOMEPAGE="http://www.freepgs.com/noad/"
+SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
+               mirror://vdrfiles/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ffmpeg imagemagick"
+
+DEPEND="media-libs/libmpeg2
+       media-video/vdr
+       ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
+       imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
+RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5"
+
+src_unpack() {
+
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/${P}-directoryfix.diff
+       epatch ${FILESDIR}/${P}-as-needed.diff
+       epatch ${FILESDIR}/${P}-cflags.diff
+       epatch ${FILESDIR}/${P}-framesize.diff
+       epatch ${FILESDIR}/${P}-delete-while-scanning.diff
+       epatch ${FILESDIR}/${P}-fix-osd.patch
+
+       rm configure
+       eautoreconf
+}
+
+src_compile() {
+
+       econf \
+               $(use_with ffmpeg) \
+               $(use_with imagemagick magick) \
+               --with-tools \
+               --with-mpeginclude=/usr/include/mpeg2dec
+
+       emake || die "emake faild"
+}
+
+src_install() {
+
+       dobin noad showindex
+       use imagemagick && dobin markpics
+
+       dodoc COPYING README INSTALL
+       # example scripts are installed as dokumentation
+       dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+       CONF_SOURCE=${FILESDIR}/0.6.0-r7
+       insinto /etc/conf.d
+       newins ${CONF_SOURCE}/confd_vdraddon.noad vdraddon.noad
+
+       insinto /usr/share/vdr/record
+       doins ${CONF_SOURCE}/record-50-noad.sh
+
+       insinto /etc/vdr/reccmds
+       doins ${CONF_SOURCE}/reccmds.noad.conf
+
+       exeinto /usr/share/vdr/bin
+       doexe ${CONF_SOURCE}/noad-reccmd
+}
+
+pkg_postinst() {
+
+       einfo
+       einfo "Congratulations, you have just installed noad!,"
+       einfo "To integrate noad in VDR you should do this:"
+       einfo
+       einfo "start and set Parameter in /etc/conf.d/vdraddon.noad"
+       einfo
+       einfo "Note: You can use here all pararmeters for noad,"
+       einfo "please look in the documentation of noad."
+       einfo
+}