diff mbox

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

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

Commit Message

alexandros.frantzis@linaro.org July 19, 2012, 10:16 a.m. UTC 
------------------------------------------------------------
revno: 238
tags: 2012.07
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Thu 2012-07-19 12:18:25 +0300
message:
  Build,Doc: Update files for 2012.07 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-06-21 12:57:43 +0000
+++ NEWS	2012-07-19 09:18:25 +0000
@@ -1,3 +1,14 @@ 
+glmark2 2012.07 (20120719)
+==========================
+
+* Add Android GUI for defining and running benchmarks.
+* Add benchmark based on the WebGL jellyfish demo (scene 'jellyfish').
+* Add benchmark based on the WebGL dynamic terrain demo (scene 'terrain').
+* Extend texture scene with the option to compute texture coordinates
+  in the shader (option 'texgen').
+* Add support for reading texture data from JPEG files.
+* Properly support options that have a finite set of acceptable values.
+
 glmark2 2012.06 (20120621)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2012-07-03 14:19:27 +0000
+++ android/AndroidManifest.xml	2012-07-19 09:18:25 +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.06" package="org.linaro.glmark2">
+      android:versionName="2012.07" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:name="org.linaro.glmark2.MainActivity"
                   android:label="@string/title_activity_main">

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2012-06-29 12:27:16 +0000
+++ android/jni/Android.mk	2012-07-19 09:18:25 +0000
@@ -54,7 +54,7 @@ 
 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="\"2012.06\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
                 -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-06-29 12:27:16 +0000
+++ android/jni/Android.ndk.mk	2012-07-19 09:18:25 +0000
@@ -47,7 +47,7 @@ 
 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="\"2012.06\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
                 -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-21 12:57:43 +0000
+++ doc/glmark2.1.in	2012-07-19 09:18:25 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "June 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "July 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2012-06-25 11:40:03 +0000
+++ wscript	2012-07-19 09:18:25 +0000
@@ -8,7 +8,7 @@ 
 out = 'build'
 top = '.'
 
-VERSION = '2012.06'
+VERSION = '2012.07'
 APPNAME = 'glmark2'
 
 def options(opt):