From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/freepv/files/freepv-0.3.0-gcc44.patch | 60 ++++++++++++++++++++++ media-gfx/freepv/files/freepv-0.3.0-gcc46.patch | 10 ++++ media-gfx/freepv/files/freepv-0.3.0-libpng14.patch | 20 ++++++++ media-gfx/freepv/files/freepv-0.3.0-noplugin.patch | 30 +++++++++++ media-gfx/freepv/files/freepv-0.3.0-stringh.patch | 10 ++++ .../freepv/files/freepv-0.3.0-unsigned_short.patch | 47 +++++++++++++++++ 6 files changed, 177 insertions(+) create mode 100644 media-gfx/freepv/files/freepv-0.3.0-gcc44.patch create mode 100644 media-gfx/freepv/files/freepv-0.3.0-gcc46.patch create mode 100644 media-gfx/freepv/files/freepv-0.3.0-libpng14.patch create mode 100644 media-gfx/freepv/files/freepv-0.3.0-noplugin.patch create mode 100644 media-gfx/freepv/files/freepv-0.3.0-stringh.patch create mode 100644 media-gfx/freepv/files/freepv-0.3.0-unsigned_short.patch (limited to 'media-gfx/freepv/files') diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch new file mode 100644 index 000000000000..af5b1a0d196e --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch @@ -0,0 +1,60 @@ +diff -Naur freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp +--- freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -26,7 +26,8 @@ + #include + + #include +-#include ++#include ++#include + + #include "OpenGLRenderer.h" + #include "Scene.h" +diff -Naur freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp +--- freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #include + +diff -Naur freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp freepv-0.3.0/src/libfreepv/SPiVparser.cpp +--- freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/SPiVparser.cpp 2010-03-11 16:18:53.000000000 +0100 +@@ -488,8 +488,8 @@ + //This method remplace the nodes that has src attributes + void SPiVparser::parseNodeURL(const char* _url) + { +- char * aux_url=NULL; +- char * url=(char*) _url; ++ const char * aux_url=NULL; ++ const char * url=(char*) _url; + if(aux_url = strrchr (_url,'/')) + { + url=aux_url; +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 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include "signatures.h" + #include ++#include + + namespace FPV{ + namespace Utils{ +diff -Naur freepv-0.3.0.orig/src/libfreepv/utils.cpp freepv-0.3.0/src/libfreepv/utils.cpp +--- freepv-0.3.0.orig/src/libfreepv/utils.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/utils.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -23,6 +23,7 @@ + */ + + #include ++#include + + #include "utils.h" + diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch new file mode 100644 index 000000000000..be6b13f522cb --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-gcc46.patch @@ -0,0 +1,10 @@ +--- freepv-0.3.0.orig/src/libfreepv/Action.h 2011-06-16 17:37:55.705868856 +0200 ++++ freepv-0.3.0/src/libfreepv/Action.h 2011-06-16 17:38:19.792311535 +0200 +@@ -24,6 +24,7 @@ + + #ifndef FPV_ACTION_H + #define FPV_ACTION_H ++#include + #include "Behavior.h" + + namespace FPV diff --git a/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch new file mode 100644 index 000000000000..36fac0ff7419 --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-libpng14.patch @@ -0,0 +1,20 @@ +--- freepv-0.3.0.orig/src/libfreepv/pngReader.cpp ++++ freepv-0.3.0/src/libfreepv/pngReader.cpp +@@ -135,7 +135,7 @@ + //Transfor grayscale images with less + //than 8 bits to 8 bits + if(color_t == PNG_COLOR_TYPE_GRAY && depth<8) +- png_set_gray_1_2_4_to_8(p_png_struct); ++ png_set_expand_gray_1_2_4_to_8(p_png_struct); + + //Add a full alpha channel if there is + //transparency information in the tRNS chunk +@@ -283,7 +283,7 @@ + //Transfor grayscale images with less + //than 8 bits to 8 bits. + if(color_t == PNG_COLOR_TYPE_GRAY && depth<8) +- png_set_gray_1_2_4_to_8(p_png_struct); ++ png_set_expand_gray_1_2_4_to_8(p_png_struct); + + //Add a full alpha channel if there is + //transparency information in the tRNS chunk diff --git a/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch new file mode 100644 index 000000000000..4ea51d50b0cc --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch @@ -0,0 +1,30 @@ +diff -Naur freepv-0.3.0.orig//CMakeLists.txt freepv-0.3.0/CMakeLists.txt +--- freepv-0.3.0.orig//CMakeLists.txt 2010-03-11 16:05:09.000000000 +0100 ++++ freepv-0.3.0/CMakeLists.txt 2010-03-11 16:05:18.000000000 +0100 +@@ -89,7 +89,6 @@ + find_package(FREEGLUT REQUIRED) + find_package(OpenGL REQUIRED) + find_package(X11 REQUIRED) +-find_package(GECKO REQUIRED) + find_package(LibXml2 REQUIRED) + find_package(PNG REQUIRED) + find_package(XF86VM REQUIRED) +@@ -107,7 +106,6 @@ + ${OPENGL_INCLUDE_DIR} + ${FREEGLUT_INCLUDE_DIR} + ${X11_INCLUDE_DIR} +- ${GECKO_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ${XF86VM_INCLUDE_DIR}) +diff -Naur freepv-0.3.0.orig//src/CMakeLists.txt freepv-0.3.0/src/CMakeLists.txt +--- freepv-0.3.0.orig//src/CMakeLists.txt 2010-03-11 16:05:09.000000000 +0100 ++++ freepv-0.3.0/src/CMakeLists.txt 2010-03-11 16:05:28.000000000 +0100 +@@ -5,7 +5,6 @@ + add_subdirectory (freepv-glut) + add_subdirectory (utils) + if(UNIX) +- add_subdirectory (freepv-mozilla) + add_subdirectory (freepv-glx) + endif(UNIX) + diff --git a/media-gfx/freepv/files/freepv-0.3.0-stringh.patch b/media-gfx/freepv/files/freepv-0.3.0-stringh.patch new file mode 100644 index 000000000000..45987355a766 --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-stringh.patch @@ -0,0 +1,10 @@ +--- freepv-0.3.0.orig/src/libfreepv/Image.cpp 2009-05-02 01:12:31.000000000 +0200 ++++ freepv-0.3.0/src/libfreepv/Image.cpp 2013-04-11 09:37:07.436358208 +0200 +@@ -23,6 +23,7 @@ + */ + + #include ++#include + + #include "Image.h" + #include "JpegReader.h" 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 new file mode 100644 index 000000000000..142b8ac0d9bd --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-unsigned_short.patch @@ -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){ -- cgit v1.2.3