forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-gfx/freepv: fix narrowing error, bug #594658
EAPI bump, clean ebuild and patches Package-Manager: Portage-2.3.3, Repoman-2.3.1
- Loading branch information
Showing
5 changed files
with
97 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| diff -Naur freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp freepv-0.3.0/src/libfreepv/Utils/signatures.cpp | ||
| --- freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp 2009-05-02 01:12:31.000000000 +0200 | ||
| +++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp 2017-01-25 15:51:23.781294110 +0100 | ||
| @@ -30,34 +30,34 @@ | ||
|
|
||
| //JPEG Signature | ||
| char jpg_size=1; | ||
| - short jpg_sig[]={0xD8FF}; | ||
| + unsigned short jpg_sig[]={0xD8FF}; | ||
| //PNG Signature | ||
| char png_size=4; | ||
| - short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A}; | ||
| + unsigned short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A}; | ||
| //XML Signature | ||
| char xml_size=3; | ||
| - short xml_sig[]={0x3F3C, 0x6D78, 0x206C}; | ||
| + unsigned short xml_sig[]={0x3F3C, 0x6D78, 0x206C}; | ||
| //DCR Signature | ||
| char dcr_size=2; | ||
| - short dcr_sig[]={0x4658, 0x5249}; | ||
| + unsigned short dcr_sig[]={0x4658, 0x5249}; | ||
| //MOV (MOOV atom) Signature | ||
| char mov_moov_size=4; | ||
| - short mov_moov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F}; | ||
| + unsigned short mov_moov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F}; | ||
| //MOV (FTYP atom) Siganture | ||
| char mov_ftyp_size=4; | ||
| - short mov_ftyp_sig[]={0x0000, 0x0000, 0x7466, 0x7079}; | ||
| + unsigned short mov_ftyp_sig[]={0x0000, 0x0000, 0x7466, 0x7079}; | ||
|
|
||
| //Signatures to check | ||
| char sig_types_num=6; | ||
| - short* signature[]={jpg_sig,png_sig,xml_sig,dcr_sig,mov_moov_sig,mov_ftyp_sig}; | ||
| + unsigned short* signature[]={jpg_sig,png_sig,xml_sig,dcr_sig,mov_moov_sig,mov_ftyp_sig}; | ||
| char sig_sizes[]={jpg_size,png_size,xml_size,dcr_size,mov_moov_size,mov_ftyp_size}; | ||
|
|
||
| const char* CheckMagicBytes(const char* filename) | ||
| { | ||
| FILE * p_file; | ||
| p_file=fopen(filename, "rb"); | ||
| - short number; | ||
| - short equal=0; | ||
| + unsigned short number; | ||
| + unsigned short equal=0; | ||
| char i, type; | ||
|
|
||
| if(p_file==NULL){ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # Copyright 1999-2017 Gentoo Foundation | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
| # $Id$ | ||
|
|
||
| EAPI=6 | ||
| inherit cmake-utils | ||
|
|
||
| DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)" | ||
| HOMEPAGE="http://freepv.sourceforge.net/" | ||
| SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz" | ||
|
|
||
| LICENSE="LGPL-2.1" | ||
| SLOT="0" | ||
| KEYWORDS="~amd64 ~x86" | ||
| IUSE="" | ||
|
|
||
| DEPEND="dev-libs/libxml2 | ||
| media-libs/libpng:0= | ||
| media-libs/freeglut | ||
| sys-libs/zlib | ||
| virtual/jpeg:0 | ||
| x11-libs/libXmu | ||
| x11-libs/libXt | ||
| x11-libs/libXxf86vm" | ||
| RDEPEND="${DEPEND}" | ||
|
|
||
| PATCHES=( | ||
| "${FILESDIR}"/${P}-gcc44.patch | ||
| "${FILESDIR}"/${P}-gcc46.patch | ||
| "${FILESDIR}"/${P}-noplugin.patch | ||
| "${FILESDIR}"/${P}-libpng14.patch | ||
| "${FILESDIR}"/${P}-stringh.patch | ||
| "${FILESDIR}"/${P}-unsigned_short.patch | ||
| ) | ||
|
|
||
| src_prepare() { | ||
| sed -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \ | ||
| -i src/libfreepv/JpegReader.cpp || die | ||
|
|
||
| sed -e 's:^INSTALL(.*)::' \ | ||
| -i src/libfreepv/CMakeLists.txt || die | ||
|
|
||
| default | ||
| } |