diff mbox

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

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

Commit Message

alexandros.frantzis@linaro.org March 22, 2012, 10:40 a.m. UTC 
------------------------------------------------------------
revno: 203
tags: 2012.03
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Thu 2012-03-22 12:37:35 +0200
message:
  Build,Doc: Update files for 2012.03 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-02-16 11:45:12 +0000
+++ NEWS	2012-03-22 10:37:35 +0000
@@ -1,3 +1,11 @@ 
+glmark2 2012.03 (20120322)
+==========================
+
+* X11:
+  - Support rendering to an off-screen surface (--off-screen).
+  - Add command-line option to select which method to use to "end"
+    a frame (--frame-end).
+
 glmark2 2012.02 (20120216)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2012-02-16 11:45:12 +0000
+++ android/AndroidManifest.xml	2012-03-22 10:37:35 +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.02" package="org.linaro.glmark2">
+      android:versionName="2012.03" 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-02-16 11:45:12 +0000
+++ android/jni/Android.mk	2012-03-22 10:37:35 +0000
@@ -26,7 +26,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.02\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.03\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2012-02-16 11:45:12 +0000
+++ android/jni/Android.ndk.mk	2012-03-22 10:37:35 +0000
@@ -22,7 +22,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.02\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.03\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2012-03-22 09:40:12 +0000
+++ doc/glmark2.1.in	2012-03-22 10:37:35 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "February 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "March 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2012-02-16 11:45:12 +0000
+++ wscript	2012-03-22 10:37:35 +0000
@@ -8,7 +8,7 @@ 
 out = 'build'
 top = '.'
 
-VERSION = '2012.02'
+VERSION = '2012.03'
 APPNAME = 'glmark2'
 
 def options(opt):