| [proaudio] proaudio/proaudio: [3129] Cinelerra: fix depends, use flags and mjpegtools sdl build |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3129
Author: dominique
Date: 2017-11-06 00:03:51 +0100 (Mon, 06 Nov 2017)
Log Message:
-----------
Cinelerra: fix depends, use flags and mjpegtools sdl build
Modified Paths:
--------------
trunk/overlays/proaudio/media-video/cinelerra/ChangeLog
trunk/overlays/proaudio/media-video/cinelerra/Manifest
trunk/overlays/proaudio/media-video/cinelerra/cinelerra-9999.ebuild
trunk/overlays/proaudio/media-video/cinelerra/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-video/cinelerra/files/
trunk/overlays/proaudio/media-video/cinelerra/files/mjpegtools-2.1.0.patch3
Modified: trunk/overlays/proaudio/media-video/cinelerra/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-video/cinelerra/ChangeLog 2017-10-30 13:30:51 UTC (rev 3128)
+++ trunk/overlays/proaudio/media-video/cinelerra/ChangeLog 2017-11-05 23:03:51 UTC (rev 3129)
@@ -1,6 +1,9 @@
# ChangeLog for media-video/screencastor
# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
+ 05 Nov 2017; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+ cinelerra-9999.ebuild: various fixes, dependencies, uses
++ files/mjpegtools-2.1.0.patch3: pass sdl cflags to the build
+cinelerra-9999.ebuild (30 Oct 2017)
Modified: trunk/overlays/proaudio/media-video/cinelerra/Manifest
===================================================================
--- trunk/overlays/proaudio/media-video/cinelerra/Manifest 2017-10-30 13:30:51 UTC (rev 3128)
+++ trunk/overlays/proaudio/media-video/cinelerra/Manifest 2017-11-05 23:03:51 UTC (rev 3129)
@@ -1,3 +1,4 @@
-EBUILD cinelerra-9999.ebuild 2603 SHA256 c694bb7f00f8279968dd13bb374e679c6b216874dbca11b8e0de54785d827280 SHA512 7004fc9775d243f0aca42328dedc57947fe2ddb1adb8483e3e07b6b08322d243e6e25ca27f9618c4b1e2f008e2bca588b421ec6564251708dbe005fc50d25875 WHIRLPOOL 43d45fa815849712573f5fb1f90abfc337b7ac906dadb918045a7b0c39ae5ff321e10bb2384d2eb85bb107648d1638ad7097becb502c63507d961a12b5e21af5
-MISC ChangeLog 339 SHA256 24702c2a7b68676b93bd4c8f27040e6244734e1c4768c763c91a7c28a3cef3d3 SHA512 27f8a0f794f52c7dfb7c281abf1479a27602135a208491df616179dbb8fdd3a5e670c174f61cb8cea905b8f320517b38515b51060f11c1874fbf3804e52ced05 WHIRLPOOL fab0757d7a7c3531ee9b7327cc6c598828c8b1406840f5a83a6fbbcc1e85e0047a9451a0078e08e5d3acd1a82bcd7b5ea9de75d46e92dbcfd1b412eeb1210bf3
-MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
+AUX mjpegtools-2.1.0.patch3 4320 SHA256 86b25d0d9a15760c1370672306d56cc80687eed3780e477fc1d7e5aa8d72da08 SHA512 7507ea35e3780d59dd48ac36a304eacf2e3dd0a8a2cac2a01d5c2e8d8a782837c01a315657d71ba95af2f23beb909631c5177fd178fc70127ee531157f14907b WHIRLPOOL 0cd40696fefdb1c6e93c70496490e915868e1c9b681891e7326ae0da21315c51ecff1a3847c8ed52d5e3c940a4bef3768d89bde36d8f7ff67c8b12ff0fca1514
+EBUILD cinelerra-9999.ebuild 2459 SHA256 48cac53de439a6d419281f6bf64181b7640f30ad322386f76e3a15fa1811fdf2 SHA512 9d6432fb7ab3c022aa9a633ff333dc4f6cfa00a970868ba3bc557e36fdb84412ff085cd51d8c736b1a1654e7a3b918259e8c9c0e3294bb1ee55455f561011fa3 WHIRLPOOL 917a66afeb62c436326cd470393c5f602b60ac05efe920e89f99cef896c3152575291bf1528fcc7e80d3f994d0d3aac0e11f72ffd60c4e5f3a0ed33eb0ad9102
+MISC ChangeLog 526 SHA256 0eef4c42102accb33cd3a27e1e139c13a5526edee7a440cfd766f9e404ae07b2 SHA512 df47adfddf0370523d4902f2e5e71998fd5d246860f46023d9d2710e70b4121236417235e8e583a6cb8fa96f4ace4febfdf1dca5a1a7e34d5ba82362ed0c0892 WHIRLPOOL fec8c7363bdea878c640e85845b6d1eb03eb5872d9ebface149cf9b8616d892dc00e6fe260ac4a22c91eec92c4d0c13814e7778d29523d7fcf85c1c9131a1223
+MISC metadata.xml 388 SHA256 1ceae9e6a5dcf27a621ea01cb7a3af4276d7abfb5bd293eb5d21673b0f176aa5 SHA512 f26a150e04bca2f4887e290cd785445149f145b5164413b6d051874c860dbff4a5ecd714db697b3bbe431595cbbf9d68c8f7916b3dfd8e2ab53fa6d8e093ea0d WHIRLPOOL a8279508e40d9020d6d06bba5f343fe3a89b0d54516ce775b56eeb8335b8c58b0aecb753e78315858ca3ae264eeb55638dce2e5bee3c9d7f9f8239a82539aa7c
Modified: trunk/overlays/proaudio/media-video/cinelerra/cinelerra-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-video/cinelerra/cinelerra-9999.ebuild 2017-10-30 13:30:51 UTC (rev 3128)
+++ trunk/overlays/proaudio/media-video/cinelerra/cinelerra-9999.ebuild 2017-11-05 23:03:51 UTC (rev 3129)
@@ -11,96 +11,93 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cpu_flags_x86_3dnow alsa altivec css debug external_ffmpeg ieee1394 cpu_flags_x86_mmx opengl oss"
+KEYWORDS=""
+IUSE="alsa -festival -git_ffmpeg cpu_flags_x86_mmx opengl -oss -pulseaudio"
-RDEPEND="media-libs/a52dec:=
- media-libs/faac:=
- media-libs/faad2:=
+RDEPEND="festival? ( app-accessibility/festival )
+ pulseaudio? ( media-sound/pulseaudio )
+ dev-libs/libxml2:=
+ dev-perl/Parse-ExuberantCTags:=
+ media-fonts/ttf-bitstream-vera:=
+ media-fonts/font-adobe-75dpi:=
+ media-fonts/font-adobe-100dpi:=
+ media-fonts/dejavu:=
+ media-gfx/inkscape:=
+ media-libs/flac:=
+ media-libs/fontconfig
>=media-libs/freetype-2
- media-libs/fontconfig
+ media-libs/giflib:=
+ media-libs/ilmbase:=
+ media-libs/jbigkit:=
+ media-libs/ladspa-sdk:=
media-libs/libdv:=
- >=media-libs/libogg-1.2:=
+ media-libs/libdvdread:=
+ media-libs/libdvdnav:=
+ media-libs/libiec61883:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
- media-libs/libsndfile:=
- >=media-libs/libtheora-1.1:=
- >=media-libs/libvorbis-1.3:=
- >=media-libs/openexr-1.5:=
- media-libs/tiff:0=
+ media-libs/libsndfile:0=
+ media-libs/libtheora:=
+ media-libs/libvorbis:=
+ media-libs/openexr:=
+ media-libs/openjpeg:=
+ media-libs/sdl-gfx:=
+ media-libs/tiff:=
media-libs/x264:=
- media-sound/lame:=
- >=media-video/mjpegtools-2
- >=sci-libs/fftw-3
+ media-libs/x265:=
+ media-sound/twolame:=
+ media-video/mjpegtools:=
+ sci-libs/fftw:=
+ sys-apps/util-linux:=
+ sys-fs/e2fsprogs:=
+ sys-fs/udftools:=
+ sys-libs/libavc1394:=
+ sys-libs/ncurses:=
x11-libs/libX11:=
x11-libs/libXext:=
x11-libs/libXft:=
+ x11-libs/libXinerama:=
x11-libs/libXv:=
x11-libs/libXvMC:=
x11-libs/libXxf86vm:=
- virtual/ffmpeg
- || ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
- virtual/jpeg:0
+ x11-libs/libvdpau:=
+ virtual/libusb:=
alsa? ( media-libs/alsa-lib:= )
- ieee1394? (
- media-libs/libiec61883:=
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.0:=
- )
opengl? (
virtual/glu
virtual/opengl
)"
DEPEND="${RDEPEND}
+ app-arch/bzip2
app-arch/xz-utils
virtual/pkgconfig
- cpu_flags_x86_mmx? ( dev-lang/nasm )"
+ dev-lang/yasm
+ cpu_flags_x86_mmx? ( dev-lang/nasm )
+ sys-apps/texinfo
+ sys-libs/zlib
+ dev-util/cmake"
S="${WORKDIR}/${P}/${PN}-5.1"
src_prepare() {
+ cp "${FILESDIR}/mjpegtools-2.1.0.patch3" "${S}/thirdparty/src"
eautoreconf
}
src_configure() {
-#€ append-cppflags -D__STDC_CONSTANT_MACROS #321945
-# append-ldflags -Wl,-z,noexecstack #212959
-
- local myconf
- use debug && myconf='--enable-x-error-output'
-
+# Good Guy tell me it is best to use the thirdparty build instead of system libraries
+# 1) it is know to work 2) it add fix and functions
econf \
+ --with-exec-name=cinelerra \
$(use_with oss) \
$(use_with alsa) \
--without-esound \
- $(use_with ieee1394 firewire) \
- $(use_enable css) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_3dnow 3dnow) \
- $(use_enable altivec) \
$(use_with opengl gl) \
- --with-plugindir=/usr/$(get_libdir)/${PN} \
- --with-buildinfo=cust/"Gentoo - ${PV}" \
- $(use_with external_ffmpeg external-ffmpeg) \
+ $(use_with git_ffmpeg git-ffmpeg) \
${myconf}
}
-src_compile() {
- emake || die
-# cd "${S}"/doc
-# ./make_manuals.sh en
-# ./make_manuals.sh fr
-# ./make_manuals.sh pt_BR
-}
-
src_install() {
make DESTDIR="${D}" install || die
-# dohtml -a pdf,png,html,texi,sdw -r doc/*
-
-# rm -rf "${D}"/usr/include
-# mv -vf "${D}"/usr/bin/mpeg3cat{,.hv} || die
-# mv -vf "${D}"/usr/bin/mpeg3dump{,.hv} || die
-# mv -vf "${D}"/usr/bin/mpeg3toc{,.hv} || die
-# dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/${PN}/mpeg2enc.plugin
-
prune_libtool_files --all
}
Added: trunk/overlays/proaudio/media-video/cinelerra/files/mjpegtools-2.1.0.patch3
===================================================================
--- trunk/overlays/proaudio/media-video/cinelerra/files/mjpegtools-2.1.0.patch3 (rev 0)
+++ trunk/overlays/proaudio/media-video/cinelerra/files/mjpegtools-2.1.0.patch3 2017-11-05 23:03:51 UTC (rev 3129)
@@ -0,0 +1,63 @@
+--- a/y4mutils/Makefile.in.orig 2013-09-21 14:11:52.000000000 +0200
++++ b/y4mutils/Makefile.in 2017-11-05 01:11:31.784149588 +0100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.12.1 from Makefile.am.
++# Makefile.in generated by automake 1.12.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2012 Free Software Foundation, Inc.
+@@ -87,7 +87,7 @@
+ am_y4mblack_OBJECTS = y4mblack.$(OBJEXT)
+ y4mblack_OBJECTS = $(am_y4mblack_OBJECTS)
+ y4mblack_DEPENDENCIES = $(LIBMJPEGUTILS)
+-am_y4mhist_OBJECTS = y4mhist.$(OBJEXT)
++am_y4mhist_OBJECTS = y4mhist-y4mhist.$(OBJEXT)
+ y4mhist_OBJECTS = $(am_y4mhist_OBJECTS)
+ am__DEPENDENCIES_1 =
+ y4mhist_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -218,6 +218,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ LT_STATIC = @LT_STATIC@
++LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+@@ -327,6 +328,7 @@
+ y4mspatialfilter_SOURCES = y4mspatialfilter.c
+ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
+ y4mhist_SOURCES = y4mhist.c
++y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
+ y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
+ y4mblack_SOURCES = y4mblack.c
+ y4mblack_LDADD = $(LIBMJPEGUTILS)
+@@ -473,7 +475,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgmtoy4m.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qttoy4m-qttoy4m.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4mblack.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4mhist.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4mhist-y4mhist.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4minterlace.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4mivtc.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y4mshift.Po@am__quote@
+@@ -519,6 +521,20 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(qttoy4m_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qttoy4m-qttoy4m.obj `if test -f 'qttoy4m.c'; then $(CYGPATH_W) 'qttoy4m.c'; else $(CYGPATH_W) '$(srcdir)/qttoy4m.c'; fi`
+
++y4mhist-y4mhist.o: y4mhist.c
++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(y4mhist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT y4mhist-y4mhist.o -MD -MP -MF $(DEPDIR)/y4mhist-y4mhist.Tpo -c -o y4mhist-y4mhist.o `test -f 'y4mhist.c' || echo '$(srcdir)/'`y4mhist.c
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/y4mhist-y4mhist.Tpo $(DEPDIR)/y4mhist-y4mhist.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='y4mhist.c' object='y4mhist-y4mhist.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(y4mhist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o y4mhist-y4mhist.o `test -f 'y4mhist.c' || echo '$(srcdir)/'`y4mhist.c
++
++y4mhist-y4mhist.obj: y4mhist.c
++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(y4mhist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT y4mhist-y4mhist.obj -MD -MP -MF $(DEPDIR)/y4mhist-y4mhist.Tpo -c -o y4mhist-y4mhist.obj `if test -f 'y4mhist.c'; then $(CYGPATH_W) 'y4mhist.c'; else $(CYGPATH_W) '$(srcdir)/y4mhist.c'; fi`
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/y4mhist-y4mhist.Tpo $(DEPDIR)/y4mhist-y4mhist.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='y4mhist.c' object='y4mhist-y4mhist.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(y4mhist_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o y4mhist-y4mhist.obj `if test -f 'y4mhist.c'; then $(CYGPATH_W) 'y4mhist.c'; else $(CYGPATH_W) '$(srcdir)/y4mhist.c'; fi`
++
+ y4mtoqt-y4mtoqt.o: y4mtoqt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(y4mtoqt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT y4mtoqt-y4mtoqt.o -MD -MP -MF $(DEPDIR)/y4mtoqt-y4mtoqt.Tpo -c -o y4mtoqt-y4mtoqt.o `test -f 'y4mtoqt.c' || echo '$(srcdir)/'`y4mtoqt.c
+ @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/y4mtoqt-y4mtoqt.Tpo $(DEPDIR)/y4mtoqt-y4mtoqt.Po
Modified: trunk/overlays/proaudio/media-video/cinelerra/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-video/cinelerra/metadata.xml 2017-10-30 13:30:51 UTC (rev 3128)
+++ trunk/overlays/proaudio/media-video/cinelerra/metadata.xml 2017-11-05 23:03:51 UTC (rev 3129)
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <maintainer>
- <email>proaudio@xxxxxxxxxxxxx</email>
- <name>pro-audio overlay team</name>
+ <maintainer type="project">
+ <email>media-video@xxxxxxxxxx</email>
+ <name>Gentoo Video project</name>
</maintainer>
+ <use>
+ <flag name="festival">app-accessibility/festival support</flag>
+ <flag name="git_ffmpeg">Use ffmpeg git</flag>
+ </use>
</pkgmetadata>