diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 224: Build, Doc: Update files for 2012.06 release.

Message ID 20120621141014.23838.12653.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org June 21, 2012, 2:10 p.m. UTC 
------------------------------------------------------------
revno: 224
tags: 2012.06
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Thu 2012-06-21 15:57:43 +0300
message:
  Build,Doc: Update files for 2012.06 release.
modified:
  NEWS
  android/AndroidManifest.xml
  android/jni/Android.mk
  android/jni/Android.ndk.mk
  doc/glmark2.1.in
  wscript


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'NEWS'
--- NEWS	2012-05-24 10:11:54 +0000
+++ NEWS	2012-06-21 12:57:43 +0000
@@ -1,3 +1,9 @@ 
+glmark2 2012.06 (20120621)
+==========================
+
+* Add command-line option to render in fullscreen mode (--fullscreen).
+* Display the frame time in addition to the FPS for each benchmark.
+
 glmark2 2012.05 (20120524)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2012-05-24 10:11:54 +0000
+++ android/AndroidManifest.xml	2012-06-21 12:57:43 +0000
@@ -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="2012.05" package="org.linaro.glmark2">
+      android:versionName="2012.06" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2012-05-24 10:11:54 +0000
+++ android/jni/Android.mk	2012-06-21 12:57:43 +0000
@@ -42,7 +42,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.05\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.06\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2012-05-24 10:11:54 +0000
+++ android/jni/Android.ndk.mk	2012-06-21 12:57:43 +0000
@@ -35,7 +35,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.05\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.06\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2012-06-15 09:03:04 +0000
+++ doc/glmark2.1.in	2012-06-21 12:57:43 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "May 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "June 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2012-06-11 10:46:53 +0000
+++ wscript	2012-06-21 12:57:43 +0000
@@ -8,7 +8,7 @@ 
 out = 'build'
 top = '.'
 
-VERSION = '2012.05'
+VERSION = '2012.06'
 APPNAME = 'glmark2'
 
 def options(opt):