pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-beampy: Require tex-latex-bin and ffmpeg3



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 25 13:47:54 2017 +0100
Changeset:	2212f4f42a8d1a3938f5f7d35d1e6207566aefb8

Modified Files:
	py-beampy/Makefile
	py-beampy/distinfo
Added Files:
	py-beampy/patches/patch-build_lib_beampy_document.py

Log Message:
py-beampy: Require tex-latex-bin and ffmpeg3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2212f4f42a8d1a3938f5f7d35d1e6207566aefb8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-beampy/Makefile                                 |  2 ++
 py-beampy/distinfo                                 |  1 +
 .../patches/patch-build_lib_beampy_document.py     | 30 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diffs:
diff --git a/py-beampy/Makefile b/py-beampy/Makefile
index 2dd35e70f4..5bbc469b5f 100644
--- a/py-beampy/Makefile
+++ b/py-beampy/Makefile
@@ -23,6 +23,8 @@ DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	dvisvgm-[0-9]*:../../wip/dvisvgm
 DEPENDS+=	pdfjam-[0-9]*:../../print/pdfjam # pdfjoin
 DEPENDS+=	inkscape-[0-9]*:../../graphics/inkscape
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-beampy/distinfo b/py-beampy/distinfo
index fa485c1c97..c239ce3cad 100644
--- a/py-beampy/distinfo
+++ b/py-beampy/distinfo
@@ -4,3 +4,4 @@ SHA1 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = 4dac419401
 RMD160 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = cf2f15cd80d07fe755e7aeface71e93ce9f79d96
 SHA512 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = ac88c2f8b4e1a6253d1ed4bf06faeee00ab940317d9dfd260874ac886f92d10f8a5c54d1cd21d553d08f434a19607a3bfd6119be3c6cdbffe081c95ef8a1c5a4
 Size (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = 14203953 bytes
+SHA1 (patch-build_lib_beampy_document.py) = 40d2175c86a865f2b9f8ce3656ca2e0af202e612
diff --git a/py-beampy/patches/patch-build_lib_beampy_document.py b/py-beampy/patches/patch-build_lib_beampy_document.py
new file mode 100644
index 0000000000..b18e400dbf
--- /dev/null
+++ b/py-beampy/patches/patch-build_lib_beampy_document.py
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- build/lib/beampy/document.py.orig	2017-01-26 20:59:10.000000000 +0000
++++ build/lib/beampy/document.py
+@@ -186,24 +186,7 @@ class document():
+         missing = False
+         for progname, cmd in self.options['external_app'].items():
+             if cmd == 'auto':
+-
+-                #Special case of video_encoder (ffmpeg or avconv)
+-                if progname == 'video_encoder':
+-                    find_ffmpeg = find_executable('ffmpeg')
+-                    find_avconv = find_executable('avconv')
+-                    if find_ffmpeg != None:
+-                        document._external_cmd[progname] = find_ffmpeg
+-                    elif find_avconv != None:
+-                        document._external_cmd[progname] = find_avconv
+-                    else:
+-                        missing = True
+-                else:
+-                    find_app = find_executable( progname )
+-                    if find_app != None:
+-                        document._external_cmd[progname] = find_app
+-                    else:
+-                        missing = True
+-
++                document._external_cmd[progname] = '@PREFIX@/bin/ffmpeg3'
+             else:
+                 document._external_cmd[progname] = cmd
+ 


Home | Main Index | Thread Index | Old Index