diff --git a/Changelog b/Changelog
index 8736e14cf9..0991b3dc5b 100644
--- 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
index 26ac7e3db9..b37ba12eee 100644
--- 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
index c3f3dceea4..6909bc44f6 100644
--- a/applications/gpac/ios-Info.plist
+++ b/applications/gpac/ios-Info.plist
@@ -37,11 +37,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.1-DEV
+ 2.2
CFBundleSignature
gpac
CFBundleVersion
- 12.0.0
+ 12.10.0
NSCameraUsageDescription
GPAC needs camera access to handle this URL
NSMicrophoneUsageDescription
diff --git a/debian/changelog b/debian/changelog
index 857d3f5746..d024c00563 100644
--- 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
index dff4f19a51..ea502ce989 100644
--- 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
index 52f5899293..f522c37bee 100644
--- 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
index 6bc84286ce..32371e46e2 100644
--- 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
index f6c835ac8f..7c11ec61f9 100644
--- a/packagers/osx/GPAC.app/Contents/Info.plist
+++ b/packagers/osx/GPAC.app/Contents/Info.plist
@@ -516,7 +516,7 @@
yes
CFBundleShortVersionString
- 2.1-DEV
+ 2.2
CFBundleSignature
gpac
CFBundleURLTypes
@@ -567,7 +567,7 @@
NSMicrophoneUsageDescription
GPAC needs microphone access to handle this URL
CFBundleVersion
- 12.0.0
+ 12.10.0
LSMinimumSystemVersion
10.5.0
NSMainNibFile
diff --git a/packagers/osx/distribution.xml b/packagers/osx/distribution.xml
index 9cea215b4a..f75c252c5c 100644
--- a/packagers/osx/distribution.xml
+++ b/packagers/osx/distribution.xml
@@ -11,7 +11,7 @@
- tmppkg.pkg
+ tmppkg.pkg
GPAC Framework rev
diff --git a/packagers/win32_64/nsis/gpac_installer.nsi b/packagers/win32_64/nsis/gpac_installer.nsi
index 819a32ddcc..4bee694c34 100644
--- 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
index 7db848fdcc..46f0699f74 100644
--- 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
index 530b777695..69110463f2 100644
--- 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
index 19d1afe0e8..c352dcd124 100644
--- 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
index 280cc69387..824a1de3c2 100644
--- 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
index 7f9514af0d..2a6a4ad872 160000
--- a/testsuite
+++ b/testsuite
@@ -1 +1 @@
-Subproject commit 7f9514af0d9c5bc3523cb35c4ad81b949f51d423
+Subproject commit 2a6a4ad872f048001600d571d49ba583dcc65536