1 |
commit: 3a3b67319ef1080c5420aae1142d4175b88e4b56 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 25 15:03:57 2017 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 25 15:04:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a3b6731 |
7 |
|
8 |
media-gfx/freepv: fix narrowing error, bug #594658 |
9 |
|
10 |
EAPI bump, clean ebuild and patches |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
media-gfx/freepv/files/freepv-0.3.0-gcc46.patch | 4 +- |
15 |
media-gfx/freepv/files/freepv-0.3.0-libpng14.patch | 4 +- |
16 |
media-gfx/freepv/files/freepv-0.3.0-stringh.patch | 4 +- |
17 |
.../freepv/files/freepv-0.3.0-unsigned_short.patch | 47 ++++++++++++++++++++++ |
18 |
media-gfx/freepv/freepv-0.3.0-r5.ebuild | 44 ++++++++++++++++++++ |
19 |
5 files changed, 97 insertions(+), 6 deletions(-) |
20 |
|
21 |
diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch |
22 |
index 985d144..be6b13f 100644 |
23 |
--- a/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch |
24 |
+++ b/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch |
25 |
@@ -1,5 +1,5 @@ |
26 |
---- src/libfreepv/Action.h.orig 2011-06-16 17:37:55.705868856 +0200 |
27 |
-+++ src/libfreepv/Action.h 2011-06-16 17:38:19.792311535 +0200 |
28 |
+--- freepv-0.3.0.orig/src/libfreepv/Action.h 2011-06-16 17:37:55.705868856 +0200 |
29 |
++++ freepv-0.3.0/src/libfreepv/Action.h 2011-06-16 17:38:19.792311535 +0200 |
30 |
@@ -24,6 +24,7 @@ |
31 |
|
32 |
#ifndef FPV_ACTION_H |
33 |
|
34 |
diff --git a/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch |
35 |
index e3b614f..36fac0f 100644 |
36 |
--- a/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch |
37 |
+++ b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch |
38 |
@@ -1,5 +1,5 @@ |
39 |
---- src/libfreepv/pngReader.cpp |
40 |
-+++ src/libfreepv/pngReader.cpp |
41 |
+--- freepv-0.3.0.orig/src/libfreepv/pngReader.cpp |
42 |
++++ freepv-0.3.0/src/libfreepv/pngReader.cpp |
43 |
@@ -135,7 +135,7 @@ |
44 |
//Transfor grayscale images with less |
45 |
//than 8 bits to 8 bits |
46 |
|
47 |
diff --git a/media-gfx/freepv/files/freepv-0.3.0-stringh.patch b/media-gfx/freepv/files/freepv-0.3.0-stringh.patch |
48 |
index 083585e..4598735 100644 |
49 |
--- a/media-gfx/freepv/files/freepv-0.3.0-stringh.patch |
50 |
+++ b/media-gfx/freepv/files/freepv-0.3.0-stringh.patch |
51 |
@@ -1,5 +1,5 @@ |
52 |
---- src/libfreepv/Image.cpp.ORIG 2009-05-02 01:12:31.000000000 +0200 |
53 |
-+++ src/libfreepv/Image.cpp 2013-04-11 09:37:07.436358208 +0200 |
54 |
+--- freepv-0.3.0.orig/src/libfreepv/Image.cpp 2009-05-02 01:12:31.000000000 +0200 |
55 |
++++ freepv-0.3.0/src/libfreepv/Image.cpp 2013-04-11 09:37:07.436358208 +0200 |
56 |
@@ -23,6 +23,7 @@ |
57 |
*/ |
58 |
|
59 |
|
60 |
diff --git a/media-gfx/freepv/files/freepv-0.3.0-unsigned_short.patch b/media-gfx/freepv/files/freepv-0.3.0-unsigned_short.patch |
61 |
new file mode 100644 |
62 |
index 00000000..142b8ac |
63 |
--- /dev/null |
64 |
+++ b/media-gfx/freepv/files/freepv-0.3.0-unsigned_short.patch |
65 |
@@ -0,0 +1,47 @@ |
66 |
+diff -Naur freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp freepv-0.3.0/src/libfreepv/Utils/signatures.cpp |
67 |
+--- freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp 2009-05-02 01:12:31.000000000 +0200 |
68 |
++++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp 2017-01-25 15:51:23.781294110 +0100 |
69 |
+@@ -30,34 +30,34 @@ |
70 |
+ |
71 |
+ //JPEG Signature |
72 |
+ char jpg_size=1; |
73 |
+- short jpg_sig[]={0xD8FF}; |
74 |
++ unsigned short jpg_sig[]={0xD8FF}; |
75 |
+ //PNG Signature |
76 |
+ char png_size=4; |
77 |
+- short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A}; |
78 |
++ unsigned short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A}; |
79 |
+ //XML Signature |
80 |
+ char xml_size=3; |
81 |
+- short xml_sig[]={0x3F3C, 0x6D78, 0x206C}; |
82 |
++ unsigned short xml_sig[]={0x3F3C, 0x6D78, 0x206C}; |
83 |
+ //DCR Signature |
84 |
+ char dcr_size=2; |
85 |
+- short dcr_sig[]={0x4658, 0x5249}; |
86 |
++ unsigned short dcr_sig[]={0x4658, 0x5249}; |
87 |
+ //MOV (MOOV atom) Signature |
88 |
+ char mov_moov_size=4; |
89 |
+- short mov_moov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F}; |
90 |
++ unsigned short mov_moov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F}; |
91 |
+ //MOV (FTYP atom) Siganture |
92 |
+ char mov_ftyp_size=4; |
93 |
+- short mov_ftyp_sig[]={0x0000, 0x0000, 0x7466, 0x7079}; |
94 |
++ unsigned short mov_ftyp_sig[]={0x0000, 0x0000, 0x7466, 0x7079}; |
95 |
+ |
96 |
+ //Signatures to check |
97 |
+ char sig_types_num=6; |
98 |
+- short* signature[]={jpg_sig,png_sig,xml_sig,dcr_sig,mov_moov_sig,mov_ftyp_sig}; |
99 |
++ unsigned short* signature[]={jpg_sig,png_sig,xml_sig,dcr_sig,mov_moov_sig,mov_ftyp_sig}; |
100 |
+ char sig_sizes[]={jpg_size,png_size,xml_size,dcr_size,mov_moov_size,mov_ftyp_size}; |
101 |
+ |
102 |
+ const char* CheckMagicBytes(const char* filename) |
103 |
+ { |
104 |
+ FILE * p_file; |
105 |
+ p_file=fopen(filename, "rb"); |
106 |
+- short number; |
107 |
+- short equal=0; |
108 |
++ unsigned short number; |
109 |
++ unsigned short equal=0; |
110 |
+ char i, type; |
111 |
+ |
112 |
+ if(p_file==NULL){ |
113 |
|
114 |
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild |
115 |
new file mode 100644 |
116 |
index 00000000..bad2816 |
117 |
--- /dev/null |
118 |
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild |
119 |
@@ -0,0 +1,44 @@ |
120 |
+# Copyright 1999-2017 Gentoo Foundation |
121 |
+# Distributed under the terms of the GNU General Public License v2 |
122 |
+# $Id$ |
123 |
+ |
124 |
+EAPI=6 |
125 |
+inherit cmake-utils |
126 |
+ |
127 |
+DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)" |
128 |
+HOMEPAGE="http://freepv.sourceforge.net/" |
129 |
+SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz" |
130 |
+ |
131 |
+LICENSE="LGPL-2.1" |
132 |
+SLOT="0" |
133 |
+KEYWORDS="~amd64 ~x86" |
134 |
+IUSE="" |
135 |
+ |
136 |
+DEPEND="dev-libs/libxml2 |
137 |
+ media-libs/libpng:0= |
138 |
+ media-libs/freeglut |
139 |
+ sys-libs/zlib |
140 |
+ virtual/jpeg:0 |
141 |
+ x11-libs/libXmu |
142 |
+ x11-libs/libXt |
143 |
+ x11-libs/libXxf86vm" |
144 |
+RDEPEND="${DEPEND}" |
145 |
+ |
146 |
+PATCHES=( |
147 |
+ "${FILESDIR}"/${P}-gcc44.patch |
148 |
+ "${FILESDIR}"/${P}-gcc46.patch |
149 |
+ "${FILESDIR}"/${P}-noplugin.patch |
150 |
+ "${FILESDIR}"/${P}-libpng14.patch |
151 |
+ "${FILESDIR}"/${P}-stringh.patch |
152 |
+ "${FILESDIR}"/${P}-unsigned_short.patch |
153 |
+) |
154 |
+ |
155 |
+src_prepare() { |
156 |
+ sed -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \ |
157 |
+ -i src/libfreepv/JpegReader.cpp || die |
158 |
+ |
159 |
+ sed -e 's:^INSTALL(.*)::' \ |
160 |
+ -i src/libfreepv/CMakeLists.txt || die |
161 |
+ |
162 |
+ default |
163 |
+} |