GPAC 2.2 release

gpac · Dec 19, 2022 · ab012bb · ab012bb
1 parent 65430e3
commit ab012bb
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 30 deletions.
diff --git a/Changelog b/Changelog
@@ -1,4 +1,4 @@
-# On-going: GPAC 2.1-DEV
+# 19/12/2022: GPAC 2.2
 
 ## Media Formats
 - 2-pass encoding for FFmpeg codecs other than libx264

diff --git a/README.md b/README.md
@@ -24,9 +24,8 @@
 
 
 # GPAC Introduction
-Current version: 2.1-DEV
 
-Latest Release: 2.0
+Latest Release: 2.2
 
 GPAC is an open-source multimedia framework focused on modularity and standards compliance.
 GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
@@ -113,18 +112,10 @@ GPAC has a peculiar story: started as a startup in NYC, GPAC gained traction fro
 # Roadmap
 Users are encouraged to use the latest tag or the master branch.
 
-The v0.8.X release (the last one using the legacy architecture) is officially deprecated.
-
 ## V2.X
 Targets:
-- [x] drop MP4Client/Osmo4 and GF_Terminal API
-- [x] User authentication for HTTP and RTSP servers
-- [ ] DASH event support
 - [ ] Web integration (emscripten, Remotery UI)
+- [ ] DASH event support
 - [ ] Better TTML2 / SMPTE ST 2052-1 support
-- [x] configure buffer level per filter
 - [ ] GUI cleanup ?
-- [x] deprecate `:filemode` in ROUTE
-- [x] support ClearKey Content Protection (CCP)
-- [x] FFMPEG subtitle support
 
diff --git a/applications/gpac/ios-Info.plist b/applications/gpac/ios-Info.plist
@@ -37,11 +37,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1-DEV</string>
+	<string>2.2</string>
 	<key>CFBundleSignature</key>
 	<string>gpac</string>
 	<key>CFBundleVersion</key>
-	<string>12.0.0</string>
+	<string>12.10.0</string>
 	<key>NSCameraUsageDescription</key>
 	<string>GPAC needs camera access to handle this URL</string>
 	<key>NSMicrophoneUsageDescription</key>

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-gpac (2.1-DEV) stable; urgency=low
+gpac (2.2) stable; urgency=low
 
   * Initial release - see https://github.com/gpac/gpac/releases for more details
 

diff --git a/debian/control b/debian/control
@@ -23,7 +23,7 @@ Package: libgpac-dev
 Architecture: any
 Section: libdevel
 Depends: gpac
-Replaces: gpac (<= 1.0.1)
+Replaces: gpac (<= 2.0.0)
 Description: Framework for production, encoding, delivery and interactive playback of multimedia content
  GPAC supports many AV codecs, multimedia containers (MP4,fMP4, TS, avi, mov, mpg, mkv ...), complex
  presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and subtitles (SRT, WebVTT, TTXT/TX3G, TTML).

diff --git a/gpac.spec b/gpac.spec
@@ -1,11 +1,11 @@
 # $Id: gpac.spec,v 1.5 2008-12-02 18:04:42 jeanlf Exp $
 Summary: Framework for production, encoding, delivery and interactive playback of multimedia content
 Name: gpac
-Version: 2.1-DEV
-Release: 2.1-DEV
+Version: 2.2
+Release: 2.2
 License: LGPL
 Group: Applications/Multimedia
-Source0: gpac-2.1-DEV.tar.gz
+Source0: gpac-2.2.tar.gz
 URL: http://gpac.io/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: SDL
@@ -74,6 +74,8 @@ rm -rf %{buildroot}
 %{_datadir}/*
 
 %changelog
+* Fri Dec 16 2022 Jean Le Feuvre
+- GPAC 2.2 release
 * Fri Sep 4 2020 Jean Le Feuvre
 - GPAC 1.0 release
 * Fri Jul 3 2015 Jean Le Feuvre

diff --git a/include/gpac/version.h b/include/gpac/version.h
@@ -42,13 +42,13 @@
  * SONAME versions must be digits (not strings)
  */
 /*! Macro giving GPAC version name expressed as a printable string*/
-#define GPAC_VERSION          "2.1-DEV"
+#define GPAC_VERSION          "2.2"
 
 // WARNING: when bumping, reflect the changes in share/python/libgpac.py !!
 /*! ABI Major number of libgpac */
 #define GPAC_VERSION_MAJOR 12
 /*! ABI Minor number of libgpac */
-#define GPAC_VERSION_MINOR 4
+#define GPAC_VERSION_MINOR 10
 /*! ABI Micro number of libgpac */
 #define GPAC_VERSION_MICRO 0
 

diff --git a/packagers/osx/GPAC.app/Contents/Info.plist b/packagers/osx/GPAC.app/Contents/Info.plist
@@ -516,7 +516,7 @@
 		<string>yes</string>
 	</dict>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1-DEV</string>
+	<string>2.2</string>
 	<key>CFBundleSignature</key>
 	<string>gpac</string>
 	<key>CFBundleURLTypes</key>
@@ -567,7 +567,7 @@
 	<key>NSMicrophoneUsageDescription</key>
 	<string>GPAC needs microphone access to handle this URL</string>
 	<key>CFBundleVersion</key>
-	<string>12.0.0</string>
+	<string>12.10.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.0</string>
 	<key>NSMainNibFile</key>

diff --git a/packagers/osx/distribution.xml b/packagers/osx/distribution.xml
@@ -11,7 +11,7 @@
     <choice id="io.gpac.gpac" visible="false">
         <pkg-ref id="io.gpac.gpac"/>
     </choice>
-    <pkg-ref id="io.gpac.gpac" version="0.7.2" onConclusion="none">tmppkg.pkg</pkg-ref>
+    <pkg-ref id="io.gpac.gpac" version="2.2.0" onConclusion="none">tmppkg.pkg</pkg-ref>
 
     <title>GPAC Framework rev</title>
    <license file="full_license.txt"></license>

diff --git a/packagers/win32_64/nsis/gpac_installer.nsi b/packagers/win32_64/nsis/gpac_installer.nsi
@@ -1,6 +1,6 @@
 ;--------------------------------
 ;General
-!define GPAC_VERSION 2.1-DEV
+!define GPAC_VERSION 2.2
 !include default.out
 
 !define GPAC_ROOT ..\..\..

diff --git a/share/doc/man/gpac-filters.1 b/share/doc/man/gpac-filters.1
@@ -11118,7 +11118,7 @@ Authors: GPAC developers, see git repo history (-log)
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.1-DEV-rev643-g3a704791e-master
+build: 2.2-rev655-g65430e305-master
 .br
 Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br

diff --git a/share/doc/man/gpac.1 b/share/doc/man/gpac.1
@@ -4942,7 +4942,7 @@ Authors: GPAC developers, see git repo history (-log)
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.1-DEV-rev643-g3a704791e-master
+build: 2.2-rev655-g65430e305-master
 .br
 Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br

diff --git a/share/doc/man/mp4box.1 b/share/doc/man/mp4box.1
@@ -2924,7 +2924,7 @@ Authors: GPAC developers, see git repo history (-log)
 .br
 For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
 .br
-build: 2.1-DEV-rev643-g3a704791e-master
+build: 2.2-rev655-g65430e305-master
 .br
 Copyright: (c) 2000-2022 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
 .br

diff --git a/share/python/libgpac/libgpac.py b/share/python/libgpac/libgpac.py
@@ -242,7 +242,7 @@
 
 #change this to reflect API we encapsulate. An incomatibility in either of these will throw a warning
 GF_ABI_MAJOR=12
-GF_ABI_MINOR=4
+GF_ABI_MINOR=10
 
 gpac_abi_major=_libgpac.gf_gpac_abi_major()
 gpac_abi_minor=_libgpac.gf_gpac_abi_minor()

diff --git a/testsuite b/testsuite