1 |
commit: 5d69e86e42f448fb7e9daa20e4f0319cac5b9f46 |
2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 29 13:02:02 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 16:44:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d69e86e |
7 |
|
8 |
media-libs/libopenshot: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
media-libs/libopenshot/Manifest | 2 - |
13 |
.../libopenshot-0.1.0-fix-tests-exit-code.patch | 31 -------- |
14 |
media-libs/libopenshot/libopenshot-0.1.0.ebuild | 76 -------------------- |
15 |
media-libs/libopenshot/libopenshot-0.1.1.ebuild | 82 ---------------------- |
16 |
4 files changed, 191 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest |
19 |
index 3d00751..d41156c 100644 |
20 |
--- a/media-libs/libopenshot/Manifest |
21 |
+++ b/media-libs/libopenshot/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST libopenshot-0.1.0.tar.gz 10970157 SHA256 1eb3cc27d9d5a5c966dd5dd445567239c6cbcc08772ba99e5f3b52c87a28d809 SHA512 bd5767b96ae38da7f31bfcca3ec5b34c458ab271d3e899b1982cd09b0576d29a3101c54fc840766d40aa7cbc83130064f0440f5c465999f0518449318ab87480 WHIRLPOOL c485271357545e85b94753659f0a58f4e7b0f4c4ee2a4d53bbcb1d650a3cef730103b73577848d0e2e6a355d42788451fbc1839c82343b2f172c3fd725906f29 |
24 |
-DIST libopenshot-0.1.1.tar.gz 10970421 SHA256 7f79084b0fda085ee5740f4907a2ac4bd736de6b3c4958b4441f49eaedfc7eee SHA512 7ed329b8a066ace9996342504ce817cd0e20a8599a71fa6483d8b2eeb52b5bfeed0cb4b9d099c34a275fc529d55d1bd0527707264ddd5d106574ee25e4fcd3ec WHIRLPOOL 9a759029f4b0ff1510157c91ac09f67c665446b5551487c6d228c2a668b019bb919aae53e5813b541863d32116017f0fc2a19dbc008e307e3bc9c32cc72df884 |
25 |
DIST libopenshot-0.1.2.tar.gz 11012039 SHA256 f5b37250aaa4f7ca29727966b818d73d6a100d92dbb7bc5270ee332f820a3657 SHA512 a713b24c5925ea99f5b749e178a635dd30d1ed666d8a1195beaabd44fd4d8b4e5282ee0fda2fef58dc5db3e1a481f535902496128142c445082130a08841540e WHIRLPOOL 7902060db5e5d4ff4136057f33f0c6149827cfa9000bae70f7271ddabe608b5672caaa3dececb68517f4419b36ecd89fb718caa9823e214203fcfc1c648d5536 |
26 |
DIST libopenshot-0.1.3.tar.gz 11019740 SHA256 4a35318af4fbeeb0c658963275e8ec1edb985497ab9674d76eb02a1d72cbb64d SHA512 d59817505812868db408a88dc1d30b5b1833910f45dd0df03937110b7d4cbd85a270773008e75a1501f4b3b89a09ea798ed9b580755adf3ae79ac24d403f6982 WHIRLPOOL 31e7b7fe98e2709d1d88c6e2c39ceaa0b81c4f9a624ea9853ffd9b86771148e1bec808ec67192cede3578bc30860f8f5a878f67745d2d2ac9838ea93f01b628c |
27 |
|
28 |
diff --git a/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch b/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch |
29 |
deleted file mode 100644 |
30 |
index ba6cb8e..00000000 |
31 |
--- a/media-libs/libopenshot/files/libopenshot-0.1.0-fix-tests-exit-code.patch |
32 |
+++ /dev/null |
33 |
@@ -1,31 +0,0 @@ |
34 |
-From c7dcc18b23e6bfeff8c37f542b37b081bc422f9b Mon Sep 17 00:00:00 2001 |
35 |
-From: Louis Sautier <sautier.louis@×××××.com> |
36 |
-Date: Tue, 15 Mar 2016 00:35:16 +0100 |
37 |
-Subject: [PATCH] Exit tests with the return value from RunAllTests() |
38 |
- |
39 |
---- |
40 |
- tests/tests.cpp | 5 +++-- |
41 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
42 |
- |
43 |
-diff --git a/tests/tests.cpp b/tests/tests.cpp |
44 |
-index 5265959..2321513 100644 |
45 |
---- a/tests/tests.cpp |
46 |
-+++ b/tests/tests.cpp |
47 |
-@@ -33,14 +33,15 @@ using namespace UnitTest; |
48 |
- |
49 |
- int main() |
50 |
- { |
51 |
-+ int exit_code = 0; |
52 |
- cout << "----------------------------" << endl; |
53 |
- cout << " RUNNING ALL TESTS" << endl; |
54 |
- cout << "----------------------------" << endl; |
55 |
- |
56 |
- // Run all unit tests |
57 |
-- RunAllTests(); |
58 |
-+ exit_code = RunAllTests(); |
59 |
- |
60 |
- cout << "----------------------------" << endl; |
61 |
- |
62 |
-- return 0; |
63 |
-+ return exit_code; |
64 |
- } |
65 |
|
66 |
diff --git a/media-libs/libopenshot/libopenshot-0.1.0.ebuild b/media-libs/libopenshot/libopenshot-0.1.0.ebuild |
67 |
deleted file mode 100644 |
68 |
index 0f77a8a..00000000 |
69 |
--- a/media-libs/libopenshot/libopenshot-0.1.0.ebuild |
70 |
+++ /dev/null |
71 |
@@ -1,76 +0,0 @@ |
72 |
-# Copyright 1999-2016 Gentoo Foundation |
73 |
-# Distributed under the terms of the GNU General Public License v2 |
74 |
-# $Id$ |
75 |
- |
76 |
-EAPI=6 |
77 |
- |
78 |
-PYTHON_COMPAT=( python3_{4,5} ) |
79 |
- |
80 |
-inherit cmake-utils python-single-r1 |
81 |
- |
82 |
-DESCRIPTION="Video editing library used by OpenShot" |
83 |
-HOMEPAGE="http://www.openshotvideo.com/" |
84 |
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" |
85 |
- |
86 |
-LICENSE="GPL-3" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="~amd64 ~x86" |
89 |
-IUSE="libav +python test" |
90 |
- |
91 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
92 |
- |
93 |
-RDEPEND=" |
94 |
- dev-qt/qtcore:5 |
95 |
- dev-qt/qtgui:5 |
96 |
- dev-qt/qtmultimedia:5[widgets] |
97 |
- media-gfx/imagemagick[cxx] |
98 |
- media-libs/libopenshot-audio |
99 |
- libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) |
100 |
- !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) |
101 |
- python? ( ${PYTHON_DEPS} ) |
102 |
-" |
103 |
-DEPEND=" |
104 |
- ${RDEPEND} |
105 |
- python? ( dev-lang/swig ) |
106 |
- test? ( dev-libs/unittest++ ) |
107 |
-" |
108 |
- |
109 |
-# https://github.com/OpenShot/libopenshot/pull/19 |
110 |
-PATCHES=( "${FILESDIR}/${P}-fix-tests-exit-code.patch" ) |
111 |
- |
112 |
-S="${WORKDIR}" |
113 |
- |
114 |
-pkg_setup() { |
115 |
- use python && python-single-r1_pkg_setup |
116 |
-} |
117 |
- |
118 |
-src_prepare() { |
119 |
- use test || cmake_comment_add_subdirectory tests |
120 |
- pushd src > /dev/null || die |
121 |
- if use python; then |
122 |
- pushd bindings > /dev/null || die |
123 |
- cmake_comment_add_subdirectory ruby # TODO: support ruby |
124 |
- popd > /dev/null || die |
125 |
- else |
126 |
- cmake_comment_add_subdirectory bindings |
127 |
- fi |
128 |
- popd > /dev/null || die |
129 |
- cmake-utils_src_prepare |
130 |
-} |
131 |
- |
132 |
-src_configure() { |
133 |
- if use python; then |
134 |
- local mycmakeargs=( |
135 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
136 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
137 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
138 |
- ) |
139 |
- fi |
140 |
- cmake-utils_src_configure |
141 |
-} |
142 |
- |
143 |
-src_test() { |
144 |
- pushd "${BUILD_DIR}/tests" > /dev/null || die |
145 |
- ./openshot-test || die "Tests failed" |
146 |
- popd > /dev/null || die |
147 |
-} |
148 |
|
149 |
diff --git a/media-libs/libopenshot/libopenshot-0.1.1.ebuild b/media-libs/libopenshot/libopenshot-0.1.1.ebuild |
150 |
deleted file mode 100644 |
151 |
index 5bc4acc..00000000 |
152 |
--- a/media-libs/libopenshot/libopenshot-0.1.1.ebuild |
153 |
+++ /dev/null |
154 |
@@ -1,82 +0,0 @@ |
155 |
-# Copyright 1999-2016 Gentoo Foundation |
156 |
-# Distributed under the terms of the GNU General Public License v2 |
157 |
-# $Id$ |
158 |
- |
159 |
-EAPI=6 |
160 |
- |
161 |
-PYTHON_COMPAT=( python3_{4,5} ) |
162 |
- |
163 |
-inherit cmake-utils python-single-r1 toolchain-funcs versionator |
164 |
- |
165 |
-DESCRIPTION="Video editing library used by OpenShot" |
166 |
-HOMEPAGE="http://www.openshotvideo.com/" |
167 |
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" |
168 |
- |
169 |
-LICENSE="GPL-3" |
170 |
-SLOT="0" |
171 |
-KEYWORDS="~amd64 ~x86" |
172 |
-IUSE="+imagemagick libav +python test" |
173 |
- |
174 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
175 |
- |
176 |
-RDEPEND=" |
177 |
- dev-qt/qtcore:5 |
178 |
- dev-qt/qtgui:5 |
179 |
- dev-qt/qtmultimedia:5[widgets] |
180 |
- media-libs/libopenshot-audio |
181 |
- imagemagick? ( media-gfx/imagemagick:0[cxx] ) |
182 |
- libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) |
183 |
- !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) |
184 |
- python? ( ${PYTHON_DEPS} ) |
185 |
-" |
186 |
-DEPEND=" |
187 |
- ${RDEPEND} |
188 |
- python? ( dev-lang/swig ) |
189 |
- test? ( dev-libs/unittest++ ) |
190 |
-" |
191 |
- |
192 |
-# https://github.com/OpenShot/libopenshot/pull/19 |
193 |
-PATCHES=( "${FILESDIR}/${PN}-0.1.0-fix-tests-exit-code.patch" ) |
194 |
- |
195 |
-S="${WORKDIR}" |
196 |
- |
197 |
-pkg_pretend() { |
198 |
- if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then |
199 |
- eerror "${P} requires a compiler with OpenMP support. Your current" |
200 |
- eerror "compiler does not support it. If you use gcc, you can" |
201 |
- eerror "re-emerge it with the 'openmp' use flag enabled." |
202 |
- die "The current compiler does not support OpenMP" |
203 |
- fi |
204 |
-} |
205 |
- |
206 |
-pkg_setup() { |
207 |
- use python && python-single-r1_pkg_setup |
208 |
-} |
209 |
- |
210 |
-src_prepare() { |
211 |
- # https://github.com/OpenShot/libopenshot/issues/17 |
212 |
- use test || cmake_comment_add_subdirectory tests |
213 |
- cmake-utils_src_prepare |
214 |
-} |
215 |
- |
216 |
-src_configure() { |
217 |
- local mycmakeargs=( |
218 |
- -DENABLE_RUBY=OFF # TODO: add ruby support |
219 |
- -DENABLE_PYTHON=$(usex python) |
220 |
- -DCMAKE_DISABLE_FIND_PACKAGE_ImageMagick=$(usex !imagemagick) |
221 |
- ) |
222 |
- if use python; then |
223 |
- mycmakeargs+=( |
224 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
225 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
226 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
227 |
- ) |
228 |
- fi |
229 |
- cmake-utils_src_configure |
230 |
-} |
231 |
- |
232 |
-src_test() { |
233 |
- pushd "${BUILD_DIR}/tests" > /dev/null || die |
234 |
- ./openshot-test || die "Tests failed" |
235 |
- popd > /dev/null || die |
236 |
-} |