summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen <eroen-overlay@occam.eroen.eu>2018-11-03 23:07:09 +0100
committerErik Moen <eroen-overlay@occam.eroen.eu>2019-08-28 19:26:46 +0200
commit28220556e4035591cc680528ccd11e5d30c902cb (patch)
tree2d54f9f6dee7db0ac66dd54d3f7c11f493f36596
parentsynfigstudio-1.3.10 (diff)
downloaderoen-28220556e4035591cc680528ccd11e5d30c902cb.tar.gz
eroen-28220556e4035591cc680528ccd11e5d30c902cb.tar.bz2
eroen-28220556e4035591cc680528ccd11e5d30c902cb.zip
clean up synfig stuff
Signed-off-by: Erik Moen <eroen-overlay@occam.eroen.eu>
-rw-r--r--dev-cpp/ETL/ETL-1.2.1.ebuild33
-rw-r--r--dev-cpp/ETL/Manifest1
-rw-r--r--media-gfx/synfig/Manifest1
-rw-r--r--media-gfx/synfig/files/01-workaround-to-implement.patch67
-rw-r--r--media-gfx/synfig/files/02-fix-magickcore-s-exceptioninfo-0.patch117
-rw-r--r--media-gfx/synfig/files/series3
-rw-r--r--media-gfx/synfig/synfig-1.2.1.ebuild79
-rw-r--r--media-gfx/synfigstudio/Manifest1
-rw-r--r--media-gfx/synfigstudio/synfigstudio-1.2.1.ebuild63
9 files changed, 0 insertions, 365 deletions
diff --git a/dev-cpp/ETL/ETL-1.2.1.ebuild b/dev-cpp/ETL/ETL-1.2.1.ebuild
deleted file mode 100644
index 9df7ab4..0000000
--- a/dev-cpp/ETL/ETL-1.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# By eroen <eroen-overlay@occam.eroen.eu>, 2018
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Header-only library used by synfig"
-HOMEPAGE="https://www.synfig.org"
-SRC_URI="mirror://sourceforge/synfig/$P.tar.gz"
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- # build system strips away -g* and -O* flags
- sed -e '/CXXFLAGS=.*debug_flags/s@`.*`@$CXXFLAGS@' \
- -e '/CFLAGS=.*debug_flags/s@`.*`@$CFLAGS@' \
- -e '/CXXFLAGS=.*optimization_flags/d' \
- -e '/CFLAGS=.*optimization_flags/d' \
- -i m4/subs.m4 || die
-
- eautoreconf
-}
diff --git a/dev-cpp/ETL/Manifest b/dev-cpp/ETL/Manifest
index 94ae37b..61ca318 100644
--- a/dev-cpp/ETL/Manifest
+++ b/dev-cpp/ETL/Manifest
@@ -1,2 +1 @@
-DIST ETL-1.2.1.tar.gz 373906 BLAKE2B 58c897172be04437d59c4df7b99f40837f974765e85bd3f8c9c128a8f6239dc18833a3496590bceb94e5139f0b3bb46399da4138bd7abc8b03d036d6a7677cb7 SHA512 59b11d6bc03b492715f88317c963dc1171b4ae042255a2b93ae167b574c4d289b78b8f5c74ac49a9c588c36ec34e8c2bac982116122c487410fea25d9d6f2948
DIST synfig-1.3.10.tar.gz 11112050 BLAKE2B 9904441655f09dd1c4e8d80e43e8257bff8db89401d74e5a65303fa526fc44e6cde809c6138db3e321129a891174afb7ad3a050f646f0bb213bf4b2dd2b19c10 SHA512 cb9564534906f92a1e1f01aaa496b1b1f7b370c44f88acdea455913dd1d95fa3833372a9318160f21636be561436f2b243ac1c26ee7a82cf548ec434512266be
diff --git a/media-gfx/synfig/Manifest b/media-gfx/synfig/Manifest
index 3d3f308..61ca318 100644
--- a/media-gfx/synfig/Manifest
+++ b/media-gfx/synfig/Manifest
@@ -1,2 +1 @@
-DIST synfig-1.2.1.tar.gz 4913740 BLAKE2B 17d217ca5560132d08a468434b83c0334899350e876f647395fa7f0c01fb2b9d54dfc5d4e75e0926bf73e04afa5c9e197d7eb8f0c3b12ca8ac5ace8c4eac1d33 SHA512 90a022824027a7eefb87f64bbe8130882d0db73c41172b99e4de81ded1e0a804787ef99a40a8583c9e51125de0770024b87bb7b65cfff9bd812618deb389e095
DIST synfig-1.3.10.tar.gz 11112050 BLAKE2B 9904441655f09dd1c4e8d80e43e8257bff8db89401d74e5a65303fa526fc44e6cde809c6138db3e321129a891174afb7ad3a050f646f0bb213bf4b2dd2b19c10 SHA512 cb9564534906f92a1e1f01aaa496b1b1f7b370c44f88acdea455913dd1d95fa3833372a9318160f21636be561436f2b243ac1c26ee7a82cf548ec434512266be
diff --git a/media-gfx/synfig/files/01-workaround-to-implement.patch b/media-gfx/synfig/files/01-workaround-to-implement.patch
deleted file mode 100644
index 2a846f4..0000000
--- a/media-gfx/synfig/files/01-workaround-to-implement.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Workaround to implement MagickCore's hidden InitializeExceptionInfo() method
-
-From: Matthew White <mehw.is.me@inventati.org>
-
-Since MagickCore version 7 deprecated methods have been removed.
-
-* synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp: Define
- MagicCore's InitializeExceptionInfo() method, which indirectly calls
- the hidden InitializeExceptionInfo() method.
-* synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
- (copy_image_list, ~magickpp_trgt): Call InitializeExceptionInfo()
- rather than the deprecated GetExceptionInfo() method.
-
-References
-==========
-- GetExceptionInfo()
- http://legacy.imagemagick.org/api/MagickCore/deprecate_8c.html#a7d788a94491285066ede5492babe205d
-- InitializeExceptionInfo()
- http://legacy.imagemagick.org/api/MagickCore/exception_8c.html#aad9984b1b0d45c9fbac8f16a6192ef8f
- http://www.imagemagick.org/api/MagickCore/exception_8c.html#aad9984b1b0d45c9fbac8f16a6192ef8f
----
- .../src/modules/mod_magickpp/trgt_magickpp.cpp | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-index 7e537c9e7..312c5f3ed 100644
---- a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-+++ b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-@@ -54,6 +54,20 @@ SYNFIG_TARGET_SET_CVS_ID(magickpp_trgt,"$Id$");
-
- /* === M E T H O D S ======================================================= */
-
-+/*
-+ * WORKAROUND
-+ *
-+ * Mimics the hidden MagickCore's InitializeExceptionInfo() method.
-+ */
-+namespace MagickCore {
-+static void InitializeExceptionInfo(ExceptionInfo *exception)
-+{
-+ MagickCore::ExceptionInfo* exceptionInfo = AcquireExceptionInfo();
-+ *exception = *exceptionInfo; // copy assignment, ExceptionInfo is a struct
-+ MagickCore::DestroyExceptionInfo(exceptionInfo);
-+}
-+}
-+
- template <class Container>
- MagickCore::Image* copy_image_list(Container& container)
- {
-@@ -61,7 +75,7 @@ MagickCore::Image* copy_image_list(Container& container)
- MagickCore::Image* previous = 0;
- MagickCore::Image* first = NULL;
- MagickCore::ExceptionInfo exceptionInfo;
-- MagickCore::GetExceptionInfo(&exceptionInfo);
-+ MagickCore::InitializeExceptionInfo(&exceptionInfo);
- for (Iter iter = container.begin(); iter != container.end(); ++iter)
- {
- MagickCore::Image* current;
-@@ -89,7 +103,7 @@ MagickCore::Image* copy_image_list(Container& container)
- magickpp_trgt::~magickpp_trgt()
- {
- MagickCore::ExceptionInfo exceptionInfo;
-- MagickCore::GetExceptionInfo(&exceptionInfo);
-+ MagickCore::InitializeExceptionInfo(&exceptionInfo);
-
- try
- {
diff --git a/media-gfx/synfig/files/02-fix-magickcore-s-exceptioninfo-0.patch b/media-gfx/synfig/files/02-fix-magickcore-s-exceptioninfo-0.patch
deleted file mode 100644
index cc433c4..0000000
--- a/media-gfx/synfig/files/02-fix-magickcore-s-exceptioninfo-0.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Fix MagickCore's exceptionInfo implementation
-
-From: Matthew White <mehw.is.me@inventati.org>
-
-Since MagickCore version 7 deprecated methods have been removed.
-
-* synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
- (copy_image_list, ~magickpp_trgt): Rather than calling MagickCore's
- GetExceptionInfo() deprecated method (removed in MagickCore version
- 7), call AcquireExceptionInfo() and DestroyExceptionInfo() to init
- and then clean exceptionInfo. Implement exceptionInfo as a pointer.
----
- .../src/modules/mod_magickpp/trgt_magickpp.cpp | 32 ++++++--------------
- 1 file changed, 9 insertions(+), 23 deletions(-)
-
-diff --git a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-index 312c5f3ed..8b4c00b57 100644
---- a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-+++ b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
-@@ -54,35 +54,20 @@ SYNFIG_TARGET_SET_CVS_ID(magickpp_trgt,"$Id$");
-
- /* === M E T H O D S ======================================================= */
-
--/*
-- * WORKAROUND
-- *
-- * Mimics the hidden MagickCore's InitializeExceptionInfo() method.
-- */
--namespace MagickCore {
--static void InitializeExceptionInfo(ExceptionInfo *exception)
--{
-- MagickCore::ExceptionInfo* exceptionInfo = AcquireExceptionInfo();
-- *exception = *exceptionInfo; // copy assignment, ExceptionInfo is a struct
-- MagickCore::DestroyExceptionInfo(exceptionInfo);
--}
--}
--
- template <class Container>
- MagickCore::Image* copy_image_list(Container& container)
- {
- typedef typename Container::iterator Iter;
- MagickCore::Image* previous = 0;
- MagickCore::Image* first = NULL;
-- MagickCore::ExceptionInfo exceptionInfo;
-- MagickCore::InitializeExceptionInfo(&exceptionInfo);
-+ MagickCore::ExceptionInfo* exceptionInfo = MagickCore::AcquireExceptionInfo();
- for (Iter iter = container.begin(); iter != container.end(); ++iter)
- {
- MagickCore::Image* current;
-
- try
- {
-- current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, &exceptionInfo);
-+ current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, exceptionInfo);
-
- if (!first) first = current;
-
-@@ -97,13 +82,13 @@ MagickCore::Image* copy_image_list(Container& container)
- }
- }
-
-+ exceptionInfo = MagickCore::DestroyExceptionInfo(exceptionInfo);
- return first;
- }
-
- magickpp_trgt::~magickpp_trgt()
- {
-- MagickCore::ExceptionInfo exceptionInfo;
-- MagickCore::InitializeExceptionInfo(&exceptionInfo);
-+ MagickCore::ExceptionInfo* exceptionInfo = MagickCore::AcquireExceptionInfo();
-
- try
- {
-@@ -117,7 +102,7 @@ magickpp_trgt::~magickpp_trgt()
- image.fileName(filename);
- try
- {
-- SetImageInfo(image.imageInfo(),Magick::MagickTrue,&exceptionInfo);
-+ SetImageInfo(image.imageInfo(),Magick::MagickTrue,exceptionInfo);
- can_adjoin = image.adjoin();
- }
- catch(Magick::Warning warning) {
-@@ -151,7 +136,7 @@ magickpp_trgt::~magickpp_trgt()
- synfig::info("removing duplicate frames");
- try
- {
-- RemoveDuplicateLayers(&image_list, &exceptionInfo);
-+ RemoveDuplicateLayers(&image_list, exceptionInfo);
- }
- catch(Magick::Warning warning) {
- synfig::warning("exception '%s'", warning.what());
-@@ -163,7 +148,7 @@ magickpp_trgt::~magickpp_trgt()
- synfig::info("optimizing layers");
- try
- {
-- image_list = OptimizeImageLayers(image_list,&exceptionInfo);
-+ image_list = OptimizeImageLayers(image_list,exceptionInfo);
- }
- catch(Magick::Warning warning) {
- synfig::warning("exception '%s'", warning.what());
-@@ -175,7 +160,7 @@ magickpp_trgt::~magickpp_trgt()
- synfig::info("optimizing layer transparency");
- try
- {
-- OptimizeImageTransparency(image_list,&exceptionInfo);
-+ OptimizeImageTransparency(image_list,exceptionInfo);
- }
- catch(Magick::Warning warning) {
- synfig::warning("exception '%s'", warning.what());
-@@ -217,6 +202,7 @@ magickpp_trgt::~magickpp_trgt()
- if (buffer1 != NULL) delete [] buffer1;
- if (buffer2 != NULL) delete [] buffer2;
- if (color_buffer != NULL) delete [] color_buffer;
-+ exceptionInfo = MagickCore::DestroyExceptionInfo(exceptionInfo);
- }
-
- bool
diff --git a/media-gfx/synfig/files/series b/media-gfx/synfig/files/series
deleted file mode 100644
index e8ffa85..0000000
--- a/media-gfx/synfig/files/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# This series applies on GIT commit 113dd7740964d467ebc09a35189097d56c13280b
-01-workaround-to-implement.patch
-02-fix-magickcore-s-exceptioninfo-0.patch
diff --git a/media-gfx/synfig/synfig-1.2.1.ebuild b/media-gfx/synfig/synfig-1.2.1.ebuild
deleted file mode 100644
index 263639b..0000000
--- a/media-gfx/synfig/synfig-1.2.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# By eroen <eroen-overlay@occam.eroen.eu>, 2018
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Vector animation renderer"
-HOMEPAGE="https://www.synfig.org"
-SRC_URI="mirror://sourceforge/synfig/$P.tar.gz"
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
- sys-libs/zlib
- >=dev-cpp/glibmm-2.24.2:2
- dev-cpp/libxmlpp:2.6
- >=x11-libs/cairo-1.12.0
- dev-cpp/cairomm
- x11-libs/pango
- dev-libs/libsigc++:2
- >=dev-libs/boost-1.53.0
- sci-libs/fftw:3.0
- media-libs/mlt
- media-libs/libpng:0
- media-libs/libmng
- "
-DEPEND="${DEPEND}
- >=dev-cpp/ETL-1.2.1"
-
-src_prepare() {
- # imagemagick-7 compatibility:
- eapply -p2 "$FILESDIR"/01-workaround-to-implement.patch\
- "$FILESDIR"/02-fix-magickcore-s-exceptioninfo-0.patch
-
- default
-
- # build system strips away -g* and -O* flags
- sed -e '/CXXFLAGS=.*debug_flags/s@`.*`@$CXXFLAGS@' \
- -e '/CFLAGS=.*debug_flags/s@`.*`@$CFLAGS@' \
- -e '/CXXFLAGS=.*optimization_flags/d' \
- -e '/CFLAGS=.*optimization_flags/d' \
- -i m4/subs.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- # default off:
- #--enable-half=no
- #--enable-layer-profiling=no
- #--with-vimage=no
- #--with-libavcodec=no
- #--with-opengl=no
-
- econf \
- --without-imagemagick \
- --with-magickpp \
- --without-ffmpeg \
- --without-libdv \
- --without-freetype \
- --without-fontconfig \
- --without-openexr \
- --without-jpeg
-
- ## fontconfig automagic when enabled
- ## openexr automagic when enabled
- ## opencl wtf?
- ## png automagic
- ## mng automagic
- ## jpeg automagic when enabled
-
- # magickpp: configure explodes when disabled
-}
diff --git a/media-gfx/synfigstudio/Manifest b/media-gfx/synfigstudio/Manifest
index f8b4e34..61ca318 100644
--- a/media-gfx/synfigstudio/Manifest
+++ b/media-gfx/synfigstudio/Manifest
@@ -1,2 +1 @@
DIST synfig-1.3.10.tar.gz 11112050 BLAKE2B 9904441655f09dd1c4e8d80e43e8257bff8db89401d74e5a65303fa526fc44e6cde809c6138db3e321129a891174afb7ad3a050f646f0bb213bf4b2dd2b19c10 SHA512 cb9564534906f92a1e1f01aaa496b1b1f7b370c44f88acdea455913dd1d95fa3833372a9318160f21636be561436f2b243ac1c26ee7a82cf548ec434512266be
-DIST synfigstudio-1.2.1.tar.gz 5687045 BLAKE2B 2f232d99fc33e04abe282a9f193a013f939dec0b8300bfb7bcf0884888045e495d07780b44b4ea4ec5068a42e9c2e83002beaa4277f1cab20b1727972b2cc625 SHA512 934d771b65f5471ae29e2961d5b52cceae47588088c18daff57e22f0dcf3a01b85818aa164e1231104fb7cbf0a1ec5331d1e57366c557e58534234babf6c28b3
diff --git a/media-gfx/synfigstudio/synfigstudio-1.2.1.ebuild b/media-gfx/synfigstudio/synfigstudio-1.2.1.ebuild
deleted file mode 100644
index 6036d2f..0000000
--- a/media-gfx/synfigstudio/synfigstudio-1.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# By eroen <eroen-overlay@occam.eroen.eu>, 2018
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils autotools
-
-DESCRIPTION="Vector animation studio"
-HOMEPAGE="https://www.synfig.org"
-SRC_URI="mirror://sourceforge/synfig/$P.tar.gz"
-LICENSE="GPL-2+ CC-BY-3.0"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
- >=dev-util/intltool-0.35.0
- >=sys-devel/gettext-0.15
- dev-cpp/gtkmm:3.0
- >=media-gfx/synfig-1.2.1
- >=dev-cpp/ETL-1.2.1
- dev-libs/libsigc++:2
- "
-DEPEND="${DEPEND}"
-
-src_prepare() {
- default
-
- # build system strips away -g* and -O* flags
- sed -e '/CXXFLAGS=.*debug_flags/s@`.*`@$CXXFLAGS@' \
- -e '/CFLAGS=.*debug_flags/s@`.*`@$CFLAGS@' \
- -e '/CXXFLAGS=.*optimization_flags/d' \
- -e '/CFLAGS=.*optimization_flags/d' \
- -i m4/subs.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-update-mimedb \
- --enable-jack=no \
- --with-libfmod=no
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}