Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libyami/, media-libs/libyami/files/
Date: Wed, 05 Oct 2016 15:09:42
Message-Id: 1475680165.67c3302519d1d0befd9f3598228c7ca4a7b63233.aballier@gentoo
1 commit: 67c3302519d1d0befd9f3598228c7ca4a7b63233
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 5 15:09:17 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 5 15:09:25 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c33025
7
8 media-libs/libyami: bump to 1.0.0
9
10 Package-Manager: portage-2.3.1
11
12 media-libs/libyami/Manifest | 1 +
13 media-libs/libyami/files/oot.patch | 48 ++++++++++++++++++++++
14 .../{libyami-9999.ebuild => libyami-1.0.0.ebuild} | 12 +++---
15 media-libs/libyami/libyami-9999.ebuild | 12 +++---
16 4 files changed, 63 insertions(+), 10 deletions(-)
17
18 diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
19 index 2d13179..59c5657 100644
20 --- a/media-libs/libyami/Manifest
21 +++ b/media-libs/libyami/Manifest
22 @@ -1,3 +1,4 @@
23 DIST libyami-0.3.0.tar.gz 484586 SHA256 67064558999d63185025a6d63d08458375003bb86369abca50aca97fd2c63acb SHA512 691cbe90840d8cb30da958bb6621434c9962ae6cbfc75b016454570c303a01e7a465baa8622368cf1ef1c670dbc861fb1d49e0c414d684feae04ea742e8e0599 WHIRLPOOL d842f1ce57d40894b80f868934d687603014b6460bdbd274b64893d8f290f8a6a779239f931beb759a7fb8e5ed1649b90fb545391c1d9c8395bb05f6600218d2
24 DIST libyami-0.3.1.tar.gz 492223 SHA256 7ab680138a1d34eb306bc941198f0715631bc8e5b0ee5717b3171f6672ca3bcb SHA512 eb58a6925de8379e40b2482780340becdb8c9295041bba11bf439cc2ff19c25f10ce4b1fc2b6c421342855946ddd471745bdfb364a227499658867911325b375 WHIRLPOOL ce44614aa04127c828761319dd96ee35956daea9cf7577e7631083e10db744c76596da7135f8f6c16952639c601ee065afe8c0097bf6d23829dc9893c4aa414f
25 DIST libyami-0.4.0.tar.gz 445389 SHA256 b4a139fac81b6644828e8c9c377fe251128d2b4440ffd656f973c0bee14a2821 SHA512 b3c5394f1980e799717cfcb44d95dc93da10d6acb94eed106bc251ca3162194a55cedb111ac7023257b77c868807e9546df461c061ab3e1b02e3f2bbd30d3687 WHIRLPOOL 1a01901dd67d49bd26a74a00684e807e162986c9674a647e96ba5e1b573a25fca78835e377b83e348d275882c69611ce1008d01a74276468f5d475d369ba23e0
26 +DIST libyami-1.0.0.tar.gz 477186 SHA256 ef83e0d279b387e8475cdd5898a9a00132fabaadd4a5b6224f707a31cd159af5 SHA512 14d79991e66a83481eb2cdcc8c82e21e1d87ca90e2ae103590f3d9d68aa6d9b761034107dda34c7d20637a94e14acb40fecaf50caab22fe85f1de01fae904f88 WHIRLPOOL ead37c22a203f94f8071b0b6e70052391ed0ec4c4fb1206f7864bef062fafeda7443dfa10f94da4c3c4598800ef75d2f3bcf2bbc508eb94c1fae39c576b2c78e
27
28 diff --git a/media-libs/libyami/files/oot.patch b/media-libs/libyami/files/oot.patch
29 new file mode 100644
30 index 00000000..96e40ba
31 --- /dev/null
32 +++ b/media-libs/libyami/files/oot.patch
33 @@ -0,0 +1,48 @@
34 +Index: libyami-libyami-1.0.0/common/Makefile.am
35 +===================================================================
36 +--- libyami-libyami-1.0.0.orig/common/Makefile.am
37 ++++ libyami-libyami-1.0.0/common/Makefile.am
38 +@@ -31,6 +31,7 @@ libyami_common_ldflags = \
39 + libyami_common_cppflags = \
40 + $(LIBVA_CFLAGS) \
41 + -I$(top_srcdir)/interface \
42 ++ -I$(top_srcdir) \
43 + $(NULL)
44 +
45 + noinst_LTLIBRARIES = libyami_common.la
46 +Index: libyami-libyami-1.0.0/common/Makefile.unittest
47 +===================================================================
48 +--- libyami-libyami-1.0.0.orig/common/Makefile.unittest
49 ++++ libyami-libyami-1.0.0/common/Makefile.unittest
50 +@@ -22,6 +22,7 @@ unittest_CPPFLAGS = \
51 + $(LIBVA_CFLAGS) \
52 + $(AM_CPPFLAGS) \
53 + -I$(top_srcdir)/interface \
54 ++ -I$(top_srcdir) \
55 + $(NULL)
56 +
57 + unittest_CXXFLAGS = \
58 +Index: libyami-libyami-1.0.0/codecparsers/Makefile.am
59 +===================================================================
60 +--- libyami-libyami-1.0.0.orig/codecparsers/Makefile.am
61 ++++ libyami-libyami-1.0.0/codecparsers/Makefile.am
62 +@@ -113,6 +113,7 @@ libyami_codecparser_cppflags = \
63 + -Dvp8dx_start_decode=libyami_vp8dx_start_decode \
64 + -Dvp8dx_bool_decoder_fill=libyami_vp8dx_bool_decoder_fill \
65 + -I$(top_srcdir)/interface \
66 ++ -I$(top_srcdir) \
67 + $(NULL)
68 +
69 + noinst_LTLIBRARIES = libyami_codecparser.la
70 +Index: libyami-libyami-1.0.0/codecparsers/Makefile.unittest
71 +===================================================================
72 +--- libyami-libyami-1.0.0.orig/codecparsers/Makefile.unittest
73 ++++ libyami-libyami-1.0.0/codecparsers/Makefile.unittest
74 +@@ -58,6 +58,7 @@ unittest_CPPFLAGS = \
75 + $(GTEST_CPPFLAGS) \
76 + $(AM_CPPFLAGS) \
77 + -I$(top_srcdir)/interface \
78 ++ -I$(top_srcdir) \
79 + $(NULL)
80 +
81 + unittest_CXXFLAGS = \
82
83 diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-1.0.0.ebuild
84 similarity index 87%
85 copy from media-libs/libyami/libyami-9999.ebuild
86 copy to media-libs/libyami/libyami-1.0.0.ebuild
87 index ad51770..10af6ad 100644
88 --- a/media-libs/libyami/libyami-9999.ebuild
89 +++ b/media-libs/libyami/libyami-1.0.0.ebuild
90 @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
91 EGIT_REPO_URI="https://github.com/01org/libyami"
92 fi
93
94 -inherit ${SCM} autotools multilib-minimal
95 +inherit ${SCM} autotools multilib-minimal flag-o-matic
96
97 DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
98 HOMEPAGE="https://github.com/01org/libyami"
99 @@ -26,10 +26,10 @@ fi
100
101 LICENSE="Apache-2.0"
102 SLOT="0"
103 -IUSE="+capi debug dmabuf doc md5 v4l X test"
104 +IUSE="debug dmabuf doc md5 v4l X test wayland"
105
106 RDEPEND="
107 - >=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
108 + >=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
109 v4l? (
110 >=virtual/opengl-7[${MULTILIB_USEDEP}]
111 >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
112 @@ -50,14 +50,15 @@ src_prepare() {
113 }
114
115 multilib_src_configure() {
116 + append-cppflags -I"${S}/"
117 ECONF_SOURCE="${S}" econf \
118 $(use_enable debug) \
119 $(use_enable v4l v4l2) \
120 $(use_enable v4l v4l2-ops) \
121 - $(use_enable capi) \
122 $(use_enable X x11) \
123 $(use_enable dmabuf) \
124 $(use_enable md5) \
125 + $(use_enable wayland) \
126 $(use_enable test gtest) \
127 $(multilib_native_use_enable doc docs) \
128 --enable-h265dec \
129 @@ -70,7 +71,8 @@ multilib_src_configure() {
130 --enable-h265enc \
131 --enable-h264enc \
132 --enable-jpegenc \
133 - --enable-vp8enc
134 + --enable-vp8enc \
135 + --enable-vp9enc
136 }
137
138 multilib_src_compile() {
139
140 diff --git a/media-libs/libyami/libyami-9999.ebuild b/media-libs/libyami/libyami-9999.ebuild
141 index ad51770..10af6ad 100644
142 --- a/media-libs/libyami/libyami-9999.ebuild
143 +++ b/media-libs/libyami/libyami-9999.ebuild
144 @@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
145 EGIT_REPO_URI="https://github.com/01org/libyami"
146 fi
147
148 -inherit ${SCM} autotools multilib-minimal
149 +inherit ${SCM} autotools multilib-minimal flag-o-matic
150
151 DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
152 HOMEPAGE="https://github.com/01org/libyami"
153 @@ -26,10 +26,10 @@ fi
154
155 LICENSE="Apache-2.0"
156 SLOT="0"
157 -IUSE="+capi debug dmabuf doc md5 v4l X test"
158 +IUSE="debug dmabuf doc md5 v4l X test wayland"
159
160 RDEPEND="
161 - >=x11-libs/libva-1.7[drm,X?,${MULTILIB_USEDEP}]
162 + >=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
163 v4l? (
164 >=virtual/opengl-7[${MULTILIB_USEDEP}]
165 >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
166 @@ -50,14 +50,15 @@ src_prepare() {
167 }
168
169 multilib_src_configure() {
170 + append-cppflags -I"${S}/"
171 ECONF_SOURCE="${S}" econf \
172 $(use_enable debug) \
173 $(use_enable v4l v4l2) \
174 $(use_enable v4l v4l2-ops) \
175 - $(use_enable capi) \
176 $(use_enable X x11) \
177 $(use_enable dmabuf) \
178 $(use_enable md5) \
179 + $(use_enable wayland) \
180 $(use_enable test gtest) \
181 $(multilib_native_use_enable doc docs) \
182 --enable-h265dec \
183 @@ -70,7 +71,8 @@ multilib_src_configure() {
184 --enable-h265enc \
185 --enable-h264enc \
186 --enable-jpegenc \
187 - --enable-vp8enc
188 + --enable-vp8enc \
189 + --enable-vp9enc
190 }
191
192 multilib_src_compile() {