lp:~darkxst/ubuntu/raring/cogl/lp1163025
- Get this branch:
- bzr branch lp:~darkxst/ubuntu/raring/cogl/lp1163025
Branch merges
- Daniel Holbach (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 10880 lines (+4112/-1287)176 files modifiedMakefile.in (+6/-1)
NEWS (+41/-0)
README (+169/-0)
README.in (+3/-0)
build/Makefile.in (+7/-2)
build/win32/Makefile.in (+5/-0)
build/win32/vs10/Makefile.in (+5/-0)
build/win32/vs10/cogl-crate.vcxproj (+4/-4)
build/win32/vs10/cogl-pango.vcxproj (+4/-4)
build/win32/vs10/cogl-pango.vcxprojin (+4/-4)
build/win32/vs10/cogl.props (+174/-151)
build/win32/vs10/cogl.sln (+0/-10)
build/win32/vs10/cogl.vcxproj (+25/-18)
build/win32/vs10/cogl.vcxproj.filters (+9/-2)
build/win32/vs10/cogl.vcxproj.filtersin (+9/-2)
build/win32/vs10/cogl.vcxprojin (+25/-18)
build/win32/vs10/install.vcxproj (+0/-4)
build/win32/vs10/test-conformance-cogl.vcxproj (+1/-0)
build/win32/vs10/test-conformance-cogl.vcxproj.filters (+1/-0)
build/win32/vs9/Makefile.in (+5/-0)
build/win32/vs9/cogl-crate.vcproj (+4/-4)
build/win32/vs9/cogl-pango.vcproj (+4/-4)
build/win32/vs9/cogl-pango.vcprojin (+4/-4)
build/win32/vs9/cogl.sln (+0/-14)
build/win32/vs9/cogl.vcproj (+25/-18)
build/win32/vs9/cogl.vcprojin (+25/-18)
build/win32/vs9/cogl.vsprops (+106/-84)
build/win32/vs9/cogl_sdl.sln (+0/-14)
build/win32/vs9/test-conformance-cogl.vcproj (+1/-0)
cogl-gles2/Makefile.in (+5/-0)
cogl-pango/Makefile.in (+5/-0)
cogl/Makefile.in (+5/-0)
cogl/cogl-bitmap.c (+7/-2)
cogl/cogl-framebuffer.c (+21/-1)
cogl/cogl-object.h (+6/-0)
cogl/cogl-pipeline-snippet-private.h (+6/-1)
cogl/cogl-pipeline-snippet.c (+20/-2)
cogl/cogl-pipeline.c (+6/-1)
cogl/cogl-snippet.h (+33/-1)
cogl/cogl.symbols (+85/-30)
cogl/driver/gl/cogl-framebuffer-gl.c (+15/-1)
cogl/driver/gl/cogl-pipeline-fragend-glsl.c (+53/-60)
cogl/driver/gl/cogl-pipeline-vertend-glsl.c (+50/-1)
cogl/driver/gl/cogl-util-gl-private.h (+7/-1)
cogl/driver/gl/cogl-util-gl.c (+39/-1)
cogl/winsys/cogl-winsys-egl.c (+18/-0)
config.h.win32 (+483/-4)
config.h.win32.in (+483/-4)
configure (+223/-62)
configure.ac (+13/-22)
debian/changelog (+6/-0)
deps/Makefile.in (+5/-0)
deps/glib/Makefile.in (+5/-0)
deps/gmodule/Makefile.in (+5/-0)
doc/Makefile.in (+5/-0)
doc/reference/Makefile.in (+5/-0)
doc/reference/cogl-2.0-experimental/Makefile.in (+5/-0)
doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml (+1/-1)
doc/reference/cogl-2.0-experimental/html/ch01.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-CoglFramebuffer---The-Framebuffer-Interface.html (+4/-4)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Path-Primitives.html (+4/-4)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Pipeline.html (+2/-2)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-Shader-snippets.html (+32/-0)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Texture-Interface.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental-The-Top-Level-Context.html (+3/-3)
doc/reference/cogl-2.0-experimental/html/cogl-2.0-experimental.devhelp2 (+2/-0)
doc/reference/cogl-2.0-experimental/html/cogl-Blend-Strings.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/index.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/index.sgml (+2/-0)
doc/reference/cogl-2.0-experimental/html/ix01.html (+2/-2)
doc/reference/cogl-2.0-experimental/html/ix02.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/ix03.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/ix04.html (+2/-2)
doc/reference/cogl-2.0-experimental/html/ix05.html (+1/-1)
doc/reference/cogl-2.0-experimental/html/ix06.html (+1/-1)
doc/reference/cogl/Makefile.in (+5/-0)
doc/reference/cogl/cogl-docs.xml (+1/-1)
doc/reference/cogl/html/ch01.html (+1/-1)
doc/reference/cogl/html/ch02.html (+1/-1)
doc/reference/cogl/html/ch03.html (+1/-1)
doc/reference/cogl/html/cogl-3D-textures.html (+18/-18)
doc/reference/cogl/html/cogl-Bitmaps.html (+8/-8)
doc/reference/cogl/html/cogl-Blend-Strings.html (+1/-1)
doc/reference/cogl/html/cogl-Buffers.html (+26/-26)
doc/reference/cogl/html/cogl-Color-Type.html (+2/-2)
doc/reference/cogl/html/cogl-General-API-(Deprecated).html (+6/-6)
doc/reference/cogl/html/cogl-General-API.html (+16/-16)
doc/reference/cogl/html/cogl-Materials.html (+23/-23)
doc/reference/cogl/html/cogl-Matrices.html (+7/-7)
doc/reference/cogl/html/cogl-Offscreen-Buffers-(Deprecated).html (+2/-2)
doc/reference/cogl/html/cogl-Offscreen-Buffers.html (+16/-16)
doc/reference/cogl/html/cogl-Path-Primitives.html (+12/-12)
doc/reference/cogl/html/cogl-Primitives.html (+2/-2)
doc/reference/cogl/html/cogl-Quaternions-(Rotations).html (+2/-2)
doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline-(Deprecated).html (+2/-2)
doc/reference/cogl/html/cogl-Shaders-and-Programmable-Pipeline.html (+8/-8)
doc/reference/cogl/html/cogl-Textures-(Deprecated).html (+2/-2)
doc/reference/cogl/html/cogl-Textures.html (+57/-57)
doc/reference/cogl/html/cogl-Vectors.html (+4/-4)
doc/reference/cogl/html/cogl-Vertex-Buffers.html (+7/-7)
doc/reference/cogl/html/index.html (+2/-2)
doc/reference/cogl/html/ix01.html (+65/-65)
doc/reference/cogl/html/ix02.html (+1/-1)
doc/reference/cogl/html/ix03.html (+1/-1)
doc/reference/cogl/html/ix04.html (+1/-1)
doc/reference/cogl/html/ix05.html (+1/-1)
doc/reference/cogl/html/ix06.html (+1/-1)
doc/reference/cogl/html/ix07.html (+1/-1)
doc/reference/cogl/html/ix08.html (+1/-1)
examples/Makefile.am (+0/-2)
examples/Makefile.in (+11/-6)
examples/cogland.c (+557/-218)
po/an.po (+1/-1)
po/ar.po (+1/-1)
po/as.po (+1/-1)
po/ast.po (+1/-1)
po/be.po (+1/-1)
po/bg.po (+1/-1)
po/ca.po (+1/-1)
po/ca@valencia.po (+1/-1)
po/cogl.pot (+2/-2)
po/cs.po (+1/-1)
po/da.po (+1/-1)
po/de.po (+1/-1)
po/el.po (+1/-1)
po/en_CA.po (+1/-1)
po/en_GB.po (+1/-1)
po/eo.po (+1/-1)
po/es.po (+1/-1)
po/eu.po (+1/-1)
po/fa.po (+1/-1)
po/fr.po (+1/-1)
po/gl.po (+1/-1)
po/he.po (+1/-1)
po/hi.po (+1/-1)
po/hu.po (+1/-1)
po/id.po (+1/-1)
po/it.po (+35/-35)
po/ja.po (+1/-1)
po/km.po (+1/-1)
po/kn.po (+1/-1)
po/ko.po (+1/-1)
po/lt.po (+1/-1)
po/lv.po (+1/-1)
po/ml.po (+1/-1)
po/nb.po (+1/-1)
po/nl.po (+1/-1)
po/or.po (+1/-1)
po/pa.po (+1/-1)
po/pl.po (+1/-1)
po/pt.po (+43/-44)
po/pt_BR.po (+1/-1)
po/ru.po (+1/-1)
po/sk.po (+460/-0)
po/sl.po (+1/-1)
po/sr.po (+1/-1)
po/sr@latin.po (+1/-1)
po/sv.po (+1/-1)
po/ta.po (+1/-1)
po/te.po (+1/-1)
po/th.po (+1/-1)
po/tr.po (+1/-1)
po/ug.po (+30/-27)
po/uk.po (+1/-1)
po/vi.po (+1/-1)
po/zh_CN.po (+1/-1)
po/zh_HK.po (+1/-1)
po/zh_TW.po (+1/-1)
tests/Makefile.in (+5/-0)
tests/conform/Makefile.am (+1/-0)
tests/conform/Makefile.in (+22/-0)
tests/conform/test-conform-main.c (+2/-0)
tests/conform/test-copy-replace-texture.c (+121/-0)
tests/conform/test-snippets.c (+111/-3)
tests/data/Makefile.in (+5/-0)
tests/micro-perf/Makefile.in (+5/-0)
Branch information
- Owner:
- Tim Lunn
- Status:
- Development
Recent revisions
- 20. By Jeremy BĂcha
-
[ Jeremy Bicha ]
* New upstream release
- soname bump
* debian/control.in:
- Bump minimum glib to 2.32
- Drop obsolete breaks/replaces
- Bump libclutter-1.0-dev breaks for soname transition
* debian/libcogl- dev.install:
- Add some missing files[ Rico Tzschichholz ]
* debian/control.in:
- Build-depend on libxrandr-dev - 18. By Sjoerd Simons
-
* New upstream release
* debian/patches/ 03_select_ default_ renderer_ driver. patch:
+ Dropped, merged upstream
* debian/patches/ 04_fix_ crash_on_ free.patch:
+ Dropped, merged upstream - 16. By Sjoerd Simons
-
* debian/rules: Set the gles2-libname to libGLESv2.so.2 as shipped by Mesa
(Closes: #678018)
* debian/patches/ 04_fix_ crash_on_ free.patch:
+ Added. Fix crash when freeing an unconnected renderer.
(Closes: #673433 #676282) - 15. By Sjoerd Simons
-
* debian/
patches/ 03_select_ default_ renderer_ driver. patch:
+ Added. Allow the default renderer driver to be selected at configure time
* Build both GL and GLESv2 renderer support on all platforms, default to
GLESv2 on ARM and to GL on everything else. - 14. By Michael Biebl
-
* Make libcogl-pango0 break libcogl5 (<< 1.10.1-1) to avoid partial
upgrades which can lead to applications like gnome-shell linking against
both libcogl5 and libcogl9 resulting in a crash. Closes: #668285
* Drop old Conflicts/Replaces: libcogl2.
* Fix the Breaks/Replaces for the libcogl-pango split. - 13. By Michael Biebl
-
* New upstream release.
* debian/copyright: Update Format URL to the final copyright 1.0 spec. - 12. By Ricardo Salveti
-
* debian/control.in:
- libcogl-dev should also depend on the gl/gles dev packages (LP: #961798)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/cogl