Build,Doc: Update files for 2023.01 release

9D-Tony · Jan 19, 2023 · 42e3d8f · 42e3d8f
1 parent b48eda4
commit 42e3d8f
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,16 @@
+glmark2 2023.01 (20230119)
+==========================
+
+* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
+* Add x11-gl-egl flavor that uses EGL under X11.
+* Implement SwapInterval 0 for the DRM backend.
+* Support multisampled configs in --visual-config.
+* Support explicitly specifying the config id in --visual-config.
+* Add CPU time and shader compilation time to available results.
+* Add --results to specify which kind of results to report.
+* Add --results-file to export results to XML or CSV.
+* Add --version command-line option.
+
 glmark2 2021.12 (20211223)
 ==========================
 

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
-      android:versionName="2021.12" package="org.linaro.glmark2">
+      android:versionName="2023.01" package="org.linaro.glmark2">
     <application android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
                  android:roundIcon="@mipmap/ic_launcher_round">

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -54,7 +54,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2021.12\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2023.01\"" \
                 -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport

diff --git a/android/jni/Android.ndk.mk b/android/jni/Android.ndk.mk
@@ -102,7 +102,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg libglad-egl libglad-glesv2
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2021.12\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2023.01\"" \
                 -DGLMARK2_USE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_LDLIBS := -landroid -llog -lz

diff --git a/doc/glmark2.1.in b/doc/glmark2.1.in
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "December 2021" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "January 2023" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

diff --git a/fastlane/metadata/android/en-US/changelogs/20230119 b/fastlane/metadata/android/en-US/changelogs/20230119
@@ -0,0 +1,12 @@
+glmark2 2023.01 (20230119)
+==========================
+
+* Add gbm-gl/glesv2 flavors for GBM offscreen rendering.
+* Add x11-gl-egl flavor that uses EGL under X11.
+* Implement SwapInterval 0 for the DRM backend.
+* Support multisampled configs in --visual-config.
+* Support explicitly specifying the config id in --visual-config.
+* Add CPU time and shader compilation time to available results.
+* Add --results to specify which kind of results to report.
+* Add --results-file to export results to XML or CSV.
+* Add --version command-line option.
diff --git a/meson.build b/meson.build
@@ -2,7 +2,7 @@ project(
     'glmark2',
     ['cpp', 'c'],
     default_options : ['cpp_std=c++14'],
-    version : '2021.12',
+    version : '2023.01',
     meson_version: '>=0.47'
     )
 

diff --git a/wscript b/wscript
@@ -4,7 +4,7 @@ from waflib import Context
 out = 'build'
 top = '.'
 
-VERSION = '2021.12'
+VERSION = '2023.01'
 APPNAME = 'glmark2'
 
 FLAVORS = {