Request 5154 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 5154 (accepted)

update to version 1.0.0

Created by Aloysius almost 4 years ago
In state accepted

Submit gpac

Submit package home:Aloysius:branches:Essentials / gpac to package Essentials / gpac

gpac.changes Changed

@@ -1,4 +1,105 @@
 -------------------------------------------------------------------
+Sat Jun 27 10:55:16 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 1.0
+ - Complete rewrite of GPAC streaming core:
+    + addition of a filter-based architecture, used by MP4Client
+      and MP4Box.
+    + moving all decoders and demuxer plugins of MP4Client and
+      most of MP4Box import/export code as filters for this new
+      architecture,
+    + moving DASH/HLS segmenter to a filter
+    + moving MP4Client compositor and most of the GF_Terminal
+      internals to a filter
+    + addition of a new application gpac, whose only purpose is
+      to create and run filter chains
+    + removal of MP42TS and DashCast applications since these
+      functionalities are provided by gpac
+    + deprecation of some features (widget management, MSE draft
+      implementation for SVG media, UPnP, TEMI player support).
+  * Profile system allowing to override through a static file
+    default options of all filters and libgpac core
+  * Alias system for gpac app to simplify your command lines
+  * Enhanced DASHer:
+    + Support for HLS and dual HLS / DASH generation
+    + Support for any input
+    + True low-latency mode for DASH
+    + Support for multiple periods
+    + Support for other segment formats (raw, mkv, webm
+      currently tested)
+  * Input and outputs
+    + Generic pipe, TCP, UDP, and Unix Domain socket input and
+      output
+    + RTSP server output
+    + HTTP output (client and server), supporting low latency
+      DASH access
+    + Ad-hoc stream format called GSF to allow serialization to
+      file, pipe or socket of a session (for distributed filter
+      chains), supporting AES-128 CBC encryption.
+  * Raw audio (PCM) and video (RGB, YUV) reframers and exporters
+  * HEVC tile spliting and merging filters
+  * Compositor is a standalone filter (SVG/BIFS/VRML graphics in
+a filter chain)
+  * Image encoding support through libjpg and libpng
+  * Full FFMPEG support:
+    + Encoding/decoding through FFMPEG libavcodec
+    + Multiplexing/demultiplexing through FFMPEG libavformat
+    + Device grabbers through FFMPEG libavdevice
+    + Raw audio and video filters through FFMPEG libavfilter
+  * Support for QuickJS (ES2002) and bindings for:
+    + Complete filter API
+    + GPAC software rasterizer (EVG)
+    + WebGL 1.0 Core
+    + XmlHttpRequest and uDOM APIs
+    + Storage
+  * Inspect and analyze filter
+  * MPEG-2 TS splitter
+  * Video cropper filter with zero-copy mode
+  * Video flip filter
+  * Source concatenator filter
+  * Simple audio and video output filters
+  * Experimental audio and video rewinder filter
+  * Encryption
+    + On-the-fly encryption and decryption, now available as
+      filters
+    + Segment-based encryption and decryption
+  * ISOBMFF
+    + box customization
+    + Better QT support, prores parsing and dumping
+    + Support for raw media (QT style or ISOBMFF for audio)
+    + Simplify HEIF batch conversion through item to track
+      mapping
+    + Reading from pipes (fragmented or progressive files)
+    + Writing to packets rather than files
+    + Fast interleaved file creation mode with less storage
+      requirements
+  * FileIO wrapper for cases where files are not stored in a
+    file system known by GPAC
+  * Testing and Documentation
+    + Live doc generation (man and wiki)
+    + Improved coverage
+    + Split test suite as dedicated repo
+    + Moved all resource to https://wiki.gpac.io
+    + Started howto pages on wiki
+    + Many bug fixes
+
+- No longer build deprecated DashCast, MP42TS, udptsseg and Osmo4
+  applications. Also drop Osmo4 subpackage
+
+- Drop gpac-0.7.1-enable_V4Studio.patch,
+  gpac-0.6.1-libpng-version-detection.patch,
+  gpac-0.7.1-system-amr.patch,
+  gpac-0.5.1-u32-count-redeclaration.patch,
+  gpac.wx.patch and gpac-0.8.0-x264-export.patch
+
+- Refresh gpac-0.6.1-64bit-portability.patch as
+  gpac-1.0.0-64bit-portability.patch
+  and gpac-0.6.1-no-pc.patch as gpac-1.0.0-no-pc.patch,
+  gpac.ssl.patch and gpac-rpmlintrc
+
+- Spec cleanup
+
+-------------------------------------------------------------------
 Thu Jun 27 11:16:12 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
 
 - Update to version 0.8.0

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2019 Packman Team <packman@links2linux.de>
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,9 +17,9 @@
 #
 
 
-%define sover   8
+%define sover   10
 Name:           gpac
-Version:        0.8.0
+Version:        1.0.0
 Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 License:        LGPL-2.1-or-later
@@ -27,67 +27,50 @@
 Url:            http://gpac.io
 Source:         https://github.com/gpac/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source90:       %{name}-rpmlintrc
-#PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:         gpac-0.7.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
 Patch2:         gpac-0.7.1-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:         gpac-0.6.1-64bit-portability.patch
-#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:         gpac-0.6.1-libpng-version-detection.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
-Patch5:         gpac-0.7.1-system-amr.patch
+Patch3:         gpac-1.0.0-64bit-portability.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:         gpac-0.6.1-no-pc.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
-# not available to the public
-Patch9:         gpac-0.8.0-x264-export.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
-Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
-Patch11:        gpac.wx.patch
+Patch6:         gpac-1.0.0-no-pc.patch
 Patch12:        gpac.ssl.patch
-BuildRequires:  ImageMagick
+# PATCH-FIX-UPSTREAM gpac-1.0.0-remove_debianism.patch
+Patch13:        gpac-1.0.0-remove_debianism.patch
 BuildRequires:  Mesa-devel
-BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  freeglut-devel
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
-BuildRequires:  liba52-devel
-BuildRequires:  libfaad-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(faad2)
+BuildRequires:  pkgconfig(freetype2)
+%if 0%{?sle_version} > 150100 || 0%{suse_version} > 1500
+BuildRequires:  pkgconfig(glut)
+%else
+BuildRequires:  freeglut-devel
+%endif
+BuildRequires:  pkgconfig(liba52)
 BuildRequires:  pkgconfig(libavcodec) = 57.107.100
 BuildRequires:  pkgconfig(libavformat) = 57.83.100
 BuildRequires:  pkgconfig(libswscale) = 4.8.100
 BuildRequires:  pkgconfig(libavdevice) = 57.10.100
 BuildRequires:  pkgconfig(libavutil) = 55.78.100
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmad-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  librsvg-devel >= 2.5.0
-BuildRequires:  libtheora-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  unzip
-BuildRequires:  update-desktop-files
-BuildRequires:  xz
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  libSDL-devel
-BuildRequires:  pkgconfig(mozjs185)
+BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libopenjpeg)
-%if 1
-BuildRequires:  wxWidgets-wxcontainer-devel
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
-%else
-BuildRequires:  wxWidgets-devel
-%endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
@@ -115,8 +98,6 @@
 most advanced and robust 2D MPEG-4 Player available worldwide, as
 well as a decent 3D MPEG-4/VRML player.
 
-Author:         Jean Le Feuvre <jeanlf at users.sourceforge.net>
-
 %package -n libgpac%{sover}
 Summary:        Shared libraries for gpac
 Group:          System/Libraries
@@ -135,80 +116,28 @@
 %description -n libgpac-devel
 Development files for gpac.
 
-Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
-
-%package -n Osmo4
-Summary:        MPEG-4 Media player based on gpac
-Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name} = %{version}
-
-%description -n Osmo4
-Osmo4 is an MPEG-4 player with the following features:
-* MPEG-4 Systems player:
-* Optimized 2D graphics renderer compliant with the Complete2D Scene
-  Graph and Graphics profiles.
-* Video and audio presentation achieved through plugins
-* Multimedia player features:
-* Timeline controls: play, pause, step.
-* Graphics features: antialising, zoom and pan, scalable resizing
-  of rendering area
-* Support for Advanced Text and Graphics extension of MPEG-4 Systems
-* Frame export to JPG, PNG, BMP.
-
-Osmo4 enables the use of MPEG-4 Systems in a vast aplication domain,
-among which:
-* downloaded or streamed cartoons
-* synchronized, interactive mixes of graphics, text, video and audio
-* applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
-  encryption, watermarking, rights management
-
 %prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%autosetup -p1
 
 %build
-# Fix encoding warnings
-cp -p Changelog Changelog.origine
-iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
-touch -r Changelog.origine Changelog
-rm -rf Changelog.origine
-
-cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
-iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
-touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
-rm -rf doc/ipmpx_syntax.bt.origine
-
-sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
-
-### corrects typo
-sed -e 's|nb_droped|nb_dropped|g' -i applications/osmo4_wx/fileprops.cpp
+# remove icon path
+sed -i '/^Icon/cIcon=gpac' share/gpac.desktop
 
 # configure the beast
 ./configure \
-    --prefix=%{_prefix} \
-    --libdir="%{_lib}" \
-    --mandir=%{_mandir} \
-    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
-
-# make the beast (NO parallel build possible ...)
-# fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
-cp config.h include/gpac/configuration.h
-make %{?_smp_mflags} all CFLAG="%{optflags}"
-make %{?_smp_mflags} sggen
-make %{?_smp_mflags} -C applications/generators/SVG
-make %{?_smp_mflags} -C applications/udptsseg
+   --prefix="%{_prefix}" \
+   --libdir="%{_lib}" \
+   --mandir="%{_mandir}" \
+   --use-a52=system \
+   --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
+
+%make_build all
+%make_build -C applications/generators/MPEG4
+%make_build -C applications/generators/SVG
+%make_build -C applications/generators/X3D
 
 # create dev-docs
-pushd doc
+pushd share/doc
     doxygen -u
     doxygen
 popd
@@ -226,34 +155,12 @@
     	%{buildroot}%{_bindir}
 done
 
-# udptsseg
-install -m 755 bin/gcc/udptsseg \
-    %{buildroot}%{_bindir}
-
-# Osmo4
-install -m 755 bin/gcc/Osmo4 \
-    %{buildroot}%{_bindir}
-
-# icon
-install -dm 755 %{buildroot}%{_datadir}/pixmaps
-convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
-    Osmo4.png
-install -m 644 Osmo4.png \
-    %{buildroot}%{_datadir}/pixmaps
-
-# menu-entry
-install -dm 755 %{buildroot}%{_datadir}/applications
-cat > Osmo4.desktop << EOF
-[Desktop Entry]
-Comment=MPEG-4 Media player based on gpac
-Name=Osmo4
-GenericName=MPEG-4 Media player based on gpac
-Type=Application
-Exec=Osmo4
-Icon=Osmo4
-Terminal=false
-EOF
-%suse_update_desktop_file -i Osmo4 AudioVideo Player
+# install manpages
+mkdir -pv %{buildroot}%{_mandir}/man1
+install -m0644 share/doc/man/* -t %{buildroot}%{_mandir}/man1
+
+# fix categories
+%suse_update_desktop_file -r %{name} 'AudioVideo;Player;'
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -268,34 +175,32 @@
 %postun -n libgpac%{sover} -p /sbin/ldconfig
 
 %files
-%doc AUTHORS BUGS Changelog README.md TODO
-%doc doc/configuration.html
+%doc Changelog README.md
+%doc share/doc/configuration.html
 %license COPYING
-%{_bindir}/DashCast
-%{_bindir}/MP42TS
 %{_bindir}/MP4Box
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
-%{_bindir}/udptsseg
-%{_libdir}/%{name}/
-%{_datadir}/%{name}/
-%{_mandir}/man1/*
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%{_libdir}/%{name}
+%{_mandir}/man1/gpac.1%{?ext_man}
+%{_mandir}/man1/gpac-filters.1%{?ext_man}
+%{_mandir}/man1/mp4box.1%{?ext_man}
+%{_mandir}/man1/mp4client.1%{?ext_man}
 
 %files -n libgpac%{sover}
 %{_libdir}/libgpac.so.%{sover}
 %{_libdir}/libgpac.so.%{sover}.*
 
 %files -n libgpac-devel
-%doc doc/CODING_STYLE doc/ipmpx_syntax.bt
+%doc share/doc/CODING_STYLE share/doc/ipmpx_syntax.bt
 %{_includedir}/%{name}/
 %{_libdir}/libgpac.so
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files -n Osmo4
-%{_bindir}/Osmo4
-%{_datadir}/pixmaps/Osmo4.png
-%{_datadir}/applications/Osmo4.desktop
-
 %changelog

gpac-0.5.1-u32-count-redeclaration.patch Deleted

gpac-0.6.1-64bit-portability.patch Deleted

@@ -1,107 +0,0 @@
---- a/applications/generators/MPEG4/main.c
-+++ b/applications/generators/MPEG4/main.c
-@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
---- a/applications/generators/SVG/svggen.h
-+++ b/applications/generators/SVG/svggen.h
-@@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
- 
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
--
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+void generate_laser_tables(GF_List *svg_elements);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void generate_laser_tables_da(GF_List *atts);
- 
- #endif // _SVGGEN_H_
---- a/applications/generators/X3D/main.c
-+++ b/applications/generators/X3D/main.c
-@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
---- a/configure
-+++ b/configure
-@@ -1277,7 +1277,6 @@ cat > $TMPC << EOF
- #include <inttypes.h>
- #define uint32_t unsigned int
- #define uint8_t unsigned char
--#include <a52dec/mm_accel.h>
- #include <a52dec/a52.h>
- int main( void ) { return 0; }
- EOF
---- a/modules/ac3_in/liba52_dec.c
-+++ b/modules/ac3_in/liba52_dec.c
-@@ -42,7 +42,6 @@
- #define uint8_t u8
- #endif
- 
--#include <a52dec/mm_accel.h>
- #include <a52dec/a52.h>
- 
- 
-@@ -71,7 +70,7 @@ static GF_Err AC3_AttachStream(GF_BaseDe
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Attaching stream %d\n", esd->ESID));
- 
- 	if (ctx->codec) a52_free(ctx->codec);
--	ctx->codec = a52_init(MM_ACCEL_DJBFFT);
-+	ctx->codec = a52_init();
- 	if (!ctx->codec) {
- 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
- 		return GF_IO_ERR;
---- a/modules/vtt_in/vtt_dec.c
-+++ b/modules/vtt_in/vtt_dec.c
-@@ -127,6 +127,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		/* TODO: try to parse a cue from the given string */
- 		break;
- 
-+#ifdef GPAC_HAS_SPIDERMONKEY
- 	case GPAC_OTI_SCENE_VTT_MP4:
- 	{
- #ifndef GPAC_DISABLE_MEDIA_IMPORT
-@@ -147,6 +148,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- #endif
- 	}
- 	break;
-+#endif
- 
- 	default:
- 		return GF_BAD_PARAM;

gpac-0.6.1-libpng-version-detection.patch Deleted

@@ -1,70 +0,0 @@
-Index: gpac-0.6.1/configure
-===================================================================
---- gpac-0.6.1.orig/configure
-+++ gpac-0.6.1/configure
-@@ -1222,11 +1222,26 @@ cat > $TMPC << EOF
- int main( void ) { return 0; }
- EOF
- 
--png_cflags="-I$prefix/include"
--png_lflags="-L$prefix/lib -lpng -lz"
-+png_flavor=""
-+if [ -d /usr/include/libpng16 ] ; then \
-+   png_flavor="png16"
-+elif [ -d /usr/include/libpng15 ] ; then \
-+   png_flavor="png15"
-+elif [ -d /usr/include/libpng14 ] ; then \
-+   png_flavor="png14"
-+elif [ -d /usr/include/libpng12 ] ; then \
-+   png_flavor="png12"
-+else
-+   png_flavor="png"
-+fi
-+
-+png_cflags="-I$prefix/include/lib$png_flavor"
-+png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
-+
- if docc $png_cflags $png_lflags $LDFLAGS ; then
-     has_png="system"
--elif docc $LDFLAGS -lpng -lz ; then
-+elif docc $LDFLAGS -l$png_flavor -lz 2> /dev/null  ; then
-+
-     has_png="system"
- fi
- if test "$cross_prefix" = "" ; then
-@@ -1239,12 +1254,12 @@ if test "$cross_prefix" = "" ; then
-     fi
- fi
- if test "$has_png" = "no" ; then
--    if docc -I$local_inc/png -L$local_lib -lpng ; then
-+    if docc -I$local_inc/$png_flavor -L$local_lib -l$png_flavor 2> /dev/null  ; then
-         has_png="local"
-     fi
- fi
- 
--
-+sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
- 
- #look for MAD support
- cat > $TMPC << EOF
-@@ -3024,6 +3039,7 @@ if test "$has_jpeg" != "no" ; then
- fi
- 
- echo "CONFIG_PNG=$has_png" >> config.mak
-+echo "png_flavor=$png_flavor" >> config.mak
- if test "$has_png" != "no" ; then
-     echo "#define GPAC_HAS_PNG" >> $TMPH
- fi
-Index: gpac-0.6.1/static.mak
-===================================================================
---- gpac-0.6.1.orig/static.mak
-+++ gpac-0.6.1/static.mak
-@@ -45,7 +45,7 @@ endif
- #5 - PNG support
- ifeq ($(CONFIG_PNG), no)
- else
--LINKLIBS+= -lpng
-+LINKLIBS+= -l$(png_flavor)
- ifeq ($(CONFIG_PNG), local)
- NEED_LOCAL_LIB="yes"
- MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.6.1-no-pc.patch Deleted

gpac-0.7.1-enable_V4Studio.patch Deleted

@@ -1,56 +0,0 @@
-Index: gpac-0.7.1/applications/Makefile
-===================================================================
---- gpac-0.7.1.orig/applications/Makefile
-+++ gpac-0.7.1/applications/Makefile
-@@ -33,15 +33,15 @@ V4STUDIODIR=
- INSTDIRS=mp4client
- ifeq ($(CONFIG_XUL),no)
- else
--#INSTDIRS+=osmozilla
--#APPDIRS+=osmozilla
-+INSTDIRS+=osmozilla
-+APPDIRS+=osmozilla
- endif
- 
- #disable due to version incompatibilities
- ifeq ($(USE_WXWIDGETS), yes)
--#APPDIRS+=osmo4_wx
--#V4STUDIODIR=V4Studio
--#INSTDIRS+=osmo4_wx
-+APPDIRS+=osmo4_wx
-+V4STUDIODIR=V4Studio
-+INSTDIRS+=osmo4_wx
- endif
- 
- #MP4BOX_STATIC
-Index: gpac-0.7.1/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.7.1/applications/osmo4_wx/Makefile
-@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
- all: $(PROG)
- 
- Osmo4$(EXE): $(OBJS)
--	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-Index: gpac-0.7.1/applications/osmozilla/osmo_npapi.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmozilla/osmo_npapi.cpp
-+++ gpac-0.7.1/applications/osmozilla/osmo_npapi.cpp
-@@ -372,11 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
- 	/* explicit plugin call */ \
- 	"application/x-gpac::GPAC plugin;" \
-  
--char * NP_GetMIMEDescription(void)
-+/*char * NP_GetMIMEDescription(void)
- {
- 	return (char *) GPAC_PLUGIN_MIMETYPES;
- }
--
-+*/
- 
- NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
- {

gpac-0.7.1-system-amr.patch Deleted

@@ -1,56 +0,0 @@
-Index: gpac-0.7.1/modules/amr_float_dec/Makefile
-===================================================================
---- gpac-0.7.1.orig/modules/amr_float_dec/Makefile
-+++ gpac-0.7.1/modules/amr_float_dec/Makefile
-@@ -18,19 +18,19 @@ endif
- #common obj
- OBJS=amr_float_dec.o
- 
-+AMR_LIBS=
-+
- #AMR NB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT
- ifeq ($(CONFIG_AMR_NB_FT), yes)
--OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
-+AMR_LIBS+=-lamrnb
- endif
- 
- 
- #AMR WB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT_WB
- ifeq ($(CONFIG_AMR_WB_FT), yes)
--OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
--	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
--	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
-+AMR_LIBS+=-lamrwb
- endif
- 
- 
-@@ -45,7 +45,7 @@ all: $(LIB)
- 
- 
- $(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS) $(LDFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-Index: gpac-0.7.1/modules/amr_float_dec/amr_float_dec.c
-===================================================================
---- gpac-0.7.1.orig/modules/amr_float_dec/amr_float_dec.c
-+++ gpac-0.7.1/modules/amr_float_dec/amr_float_dec.c
-@@ -46,12 +46,12 @@
- 
- #ifdef GPAC_HAS_AMR_FT
- /*AMR WB*/
--#include "amr_nb_ft/interf_dec.h"
-+#include <amrnb/interf_dec.h>
- #endif
- 
- #ifdef GPAC_HAS_AMR_FT_WB
- /*AMR WB*/
--#include "amr_wb_ft/dec_if.h"
-+#include <amrwb/dec_if.h>
- #endif
- 
- #endif

gpac-0.8.0-x264-export.patch Deleted

gpac-1.0.0-64bit-portability.patch Added

gpac-1.0.0-no-pc.patch Added

gpac-1.0.0-remove_debianism.patch Added

@@ -0,0 +1,39 @@
+From 45633fabccf331405f5c09aa44db86d6962dfd0f Mon Sep 17 00:00:00 2001
+From: Aurelien David <aurelien.david@telecom-paristech.fr>
+Date: Wed, 17 Jun 2020 20:03:59 +0200
+Subject: [PATCH] don't use sylinks for pixmap in make install (#1512)
+
+---
+ Makefile | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+Index: gpac-1.0.0/Makefile
+===================================================================
+--- gpac-1.0.0.orig/Makefile
++++ gpac-1.0.0/Makefile
+@@ -164,13 +164,8 @@ ifneq ($(CONFIG_DARWIN),yes)
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+ 
+-ifeq ($(IS_DEB_MAKE),undefined)
+-	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
++	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.png "$(DESTDIR)$(prefix)/share/pixmaps/"
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+-else
+-	dh_link $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)$(prefix)/share/pixmaps/gpac.png
+-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)$(prefix)/share/applications/"
+-endif
+ 
+ endif
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
+@@ -240,8 +235,8 @@ endif
+ 	rm -rf $(DESTDIR)$(mandir)/man1/gpac.1
+ 	rm -rf $(DESTDIR)$(mandir)/man1/gpac-filters.1
+ 	rm -rf $(DESTDIR)$(prefix)/share/gpac
+-	rm -rf $(DESTDIR)/usr/share/pixmaps/gpac.png
+-	rm -rf $(DESTDIR)/usr/share/applications/gpac.desktop
++	rm -rf $(DESTDIR)/$(prefix)/share/pixmaps/gpac.png
++	rm -rf $(DESTDIR)/$(prefix)/share/applications/gpac.desktop
+ 	rm -rf $(DESTDIR)$(prefix)/include/gpac
+ 
+ installdylib:

gpac.ssl.patch Changed

@@ -1,8 +1,8 @@
-Index: gpac-0.8.0/src/utils/downloader.c
+Index: gpac-1.0.0/src/utils/downloader.c
 ===================================================================
---- gpac-0.8.0.orig/src/utils/downloader.c
-+++ gpac-0.8.0/src/utils/downloader.c
-@@ -394,8 +394,7 @@ static Bool init_ssl_lib() {
+--- gpac-1.0.0.orig/src/utils/downloader.c
++++ gpac-1.0.0/src/utils/downloader.c
+@@ -406,8 +406,7 @@ Bool gf_ssl_init_lib() {
  #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
  	SSL_load_error_strings();
@@ -12,7 +12,7 @@
  #endif
  
  	_ssl_is_initialized = GF_TRUE;
-@@ -432,13 +431,13 @@ static int ssl_init(GF_DownloadManager *
+@@ -444,13 +443,13 @@ static int ssl_init(GF_DownloadManager *
  	case 1:
  		meth = SSLv2_client_method();
  		break;
@@ -24,6 +24,6 @@
  		meth = TLSv1_client_method();
  		break;
 +#endif
- #else /* for openssl 1.1+ this is the prefered method */
+ #else /* for openssl 1.1+ this is the preferred method */
  	case 0:
  		meth = TLS_client_method();

gpac.wx.patch Deleted

@@ -1,250 +0,0 @@
-Index: gpac-0.7.1/applications/osmo4_wx/wxOsmo4.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/wxOsmo4.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/wxOsmo4.cpp
-@@ -235,10 +235,10 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 	break;
- 	case GF_EVENT_PROGRESS:
- 	{
--		const char *sTitle;
--		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
--		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
--		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
-+		const char *sTitle = "";
-+		if (evt->progress.progress_type==0) sTitle = "Buffer";
-+		else if (evt->progress.progress_type==1) sTitle = "Download";
-+		else if (evt->progress.progress_type==2) sTitle = "Import";
- 		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
- 	}
- 	break;
-@@ -289,7 +289,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 			{
- 				wxGPACEvent wxevt(app);
- 				wxevt.gpac_evt = *evt;
--				app->AddPendingEvent(wxevt);
-+				app->GetEventHandler()->AddPendingEvent(wxevt);
- 			}
- 			break;
- 			}
-@@ -302,7 +302,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
- 		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
- 		if (!evt->connect.is_connected) app->m_duration = 0;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	break;
- 	case GF_EVENT_NAVIGATE:
-@@ -310,7 +310,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxGPACEvent wxevt(app);
- 		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
- 		wxevt.gpac_evt.type = evt->type;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	return 1;
- 	case GF_EVENT_SET_CAPTION:
-@@ -318,7 +318,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxGPACEvent wxevt(app);
- 		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
- 		wxevt.gpac_evt.type = evt->type;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	return 1;
- 
-@@ -330,7 +330,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 	{
- 		wxGPACEvent wxevt(app);
- 		wxevt.gpac_evt = *evt;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	break;
- 	case GF_EVENT_DBLCLICK:
-@@ -539,7 +539,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 	wxString abs_gpac_path = wxT("");
- 	char *gpac_cfg, *sep;
- 
--	::wxLogMessage(wxT("Looking for GPAC configuration file"));
-+	wxLogMessage(wxT("Looking for GPAC configuration file"));
- 
- 	/*load config*/
- 	Bool first_launch = 0;
-@@ -568,7 +568,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 
- 	gf_sys_init(GF_MemTrackerNone);
- 
--	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
-+	wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
- 
- 	m_user.modules = gf_modules_new(str, m_user.config);
- 	/*initial launch*/
-@@ -594,12 +594,12 @@ Bool wxOsmo4Frame::LoadTerminal()
- 
- 
- 
--	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
-+	wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
- 	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
--		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
-+		wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
- 	}
- 
--	::wxLogMessage(wxT("Starting GPAC Terminal"));
-+	wxLogMessage(wxT("Starting GPAC Terminal"));
- 	/*now load terminal*/
- 	m_user.opaque = this;
- 	m_user.EventProc = GPAC_EventProc;
-@@ -611,7 +611,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
- 		return 0;
- 	} else {
--		::wxLogMessage(wxT("GPAC Terminal started") );
-+		wxLogMessage(wxT("GPAC Terminal started") );
- 	}
- 	return 1;
- }
-@@ -877,7 +877,7 @@ wxOsmo4Frame::wxOsmo4Frame() :
- 	sOpt = gf_cfg_get_key(m_user.config, "Audio", "DriverName");
- 
- 	if (!strcmp(sOpt, "No Audio Output Available")) {
--		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
-+		wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
- 		SetStatus(wxT("No audio ouput available"));
- 
- 	} else {
-@@ -1140,7 +1140,7 @@ wxString wxOsmo4Frame::GetFileFilter()
- 
- void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxFD_OPEN | wxFD_MULTIPLE | wxFD_CHANGE_DIR /*| wxHIDE_READONLY*/);
- 
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
-@@ -1934,7 +1934,7 @@ void wxMyComboBox::OnKeyUp(wxKeyEvent &e
- 		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
- 		evt.SetEventObject(this);
- 		evt.SetId(GetId());
--		GetParent()->AddPendingEvent(evt);
-+		GetParent()->GetEventHandler()->AddPendingEvent(evt);
- 	}
- }
- 
-@@ -2169,7 +2169,7 @@ void wxOsmo4Frame::OnUpdateStreamMenu(wx
- 
- void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxFD_OPEN | wxFD_CHANGE_DIR /* | wxHIDE_READONLY*/);
- 
- 	if (dlg.ShowModal() == wxID_OK) {
- 		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
-Index: gpac-0.7.1/applications/osmo4_wx/menubtn.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/menubtn.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/menubtn.cpp
-@@ -86,7 +86,7 @@ bool wxCustomButton::Create(wxWindow* pa
- 
- 	wxSize bestSize = DoGetBestSize();
- 	SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	SetBestSize(GetSize());
- #else
- 	SetInitialSize(GetSize());
-@@ -161,7 +161,7 @@ void wxCustomButton::OnMouseEvents(wxMou
- 
- 		m_eventType = wxEVT_LEFT_UP;
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
- #else
- 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-@@ -200,7 +200,7 @@ void wxCustomButton::OnMouseEvents(wxMou
- 
- 		m_eventType = wxEVT_RIGHT_UP;
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
- #else
- 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-@@ -319,7 +319,7 @@ void wxCustomButton::Redraw()
- 
- void wxCustomButton::Paint( wxDC &dc )
- {
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	dc.BeginDrawing();
- #endif
- 
-@@ -407,7 +407,7 @@ void wxCustomButton::Paint( wxDC &dc )
- 	dc.SetBackground(wxNullBrush);
- 	dc.SetBrush(wxNullBrush);
- 	dc.SetPen(wxNullPen);
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	dc.EndDrawing();
- #endif
- }
-@@ -580,7 +580,7 @@ public:
- 		{
- 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 			if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
- #else
- 			if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
-@@ -628,7 +628,7 @@ public:
- 		{
- 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 			if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
- #else
- 			if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
-@@ -706,7 +706,7 @@ bool wxMenuButton::Create( wxWindow* par
- 	SetSize( wxSize(size.x < 0 ? bestSize.x : size.x,
- 	                size.y < 0 ? bestSize.y : size.y) );
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	SetBestSize(GetSize());
- #else
- 	SetInitialSize(GetSize());
-Index: gpac-0.7.1/applications/osmo4_wx/Playlist.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/Playlist.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/Playlist.cpp
-@@ -296,7 +296,7 @@ void wxPlaylist::RefreshList()
- 
- void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxOPEN | wxCHANGE_DIR | /*wxHIDE_READONLY |*/ wxMULTIPLE);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxFD_OPEN | wxFD_CHANGE_DIR | /*wxHIDE_READONLY |*/ wxFD_MULTIPLE);
- 
- 	if (dlg.ShowModal() == wxID_OK) {
- 		wxArrayString stra;
-@@ -452,7 +452,7 @@ void wxPlaylist::OnSave(wxCommandEvent &
- 	char szPath[GF_MAX_PATH];
- 	if (!gf_list_count(m_entries)) return;
- 
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxSAVE | wxCHANGE_DIR | wxOVERWRITE_PROMPT);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_SAVE | wxFD_CHANGE_DIR | wxFD_OVERWRITE_PROMPT);
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
- 	strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-@@ -501,7 +501,7 @@ void wxPlaylist::Save(char *szPath, Bool
- 
- void wxPlaylist::OnOpen(wxCommandEvent & WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxOPEN | wxCHANGE_DIR/* | wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_OPEN | wxFD_CHANGE_DIR/* | wxHIDE_READONLY*/);
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
- 	Clear();

gpac-0.8.0.tar.gz -> gpac-1.0.0.tar.gz Changed

gpac-rpmlintrc Changed

Build Results
RPM Lint

Refresh

Comments for request 5154 0

Request History

Aloysius created request almost 4 years ago

update to version 1.0.0

olh accepted request almost 4 years ago