diff options
author | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2012-07-25 12:43:56 -0300 |
---|---|---|
committer | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2012-07-25 12:43:56 -0300 |
commit | 522e0bb5598813e933e0f9fd33bc4ef48264cbaf (patch) | |
tree | 435cf1926c4db4b249ae62c5019c38976fde3d2b | |
parent | dbd46a67f700f0c7bb9fc71950518381e4033678 (diff) | |
parent | 7fb51412b963536bb6d07648a4fc4b5e11485ae9 (diff) |
Merge tag 'upstream/1.9.0.4.2.2'
22 files changed, 25 insertions, 25 deletions
diff --git a/fetch-pvr-omap/log.txt b/fetch-pvr-omap/log.txt index 46c2961..c445c65 100644 --- a/fetch-pvr-omap/log.txt +++ b/fetch-pvr-omap/log.txt @@ -1,12 +1,12 @@ fetch-pvr-omap -Wed Jul 4 17:29:34 CEST 2012 +Wed Jul 25 14:37:24 CEST 2012 === "Fetched" packages: -- sgx-lib_1.9.0.4.1-1glp1_armhf.deb -- sgx-lib-data_1.9.0.4.1-1glp1_all.deb -- sgx-lib-dev_1.9.0.4.1-1glp1_armhf.deb -- xserver-xorg-video-omap-pvr_0.3.2-0ubuntu1_armhf.deb -- xserver-xorg-video-omap-pvr-dbg_0.3.2-0ubuntu1_armhf.deb -- sgx-lib-dbgsym_1.9.0.4.1-1glp1_armhf.ddeb +- sgx-lib_1.9.0.4.2-1glp2_armhf.deb +- sgx-lib-data_1.9.0.4.2-1glp2_all.deb +- sgx-lib-dev_1.9.0.4.2-1glp2_armhf.deb +- xserver-xorg-video-omap-pvr_0.3.4-0ubuntu1_armhf.deb +- xserver-xorg-video-omap-pvr-dbg_0.3.4-0ubuntu1_armhf.deb +- sgx-lib-dbgsym_1.9.0.4.2-1glp2_armhf.ddeb diff --git a/fetch-pvr-omap/sgx-lib-data/control b/fetch-pvr-omap/sgx-lib-data/control index 6c862ea..0afdffc 100644 --- a/fetch-pvr-omap/sgx-lib-data/control +++ b/fetch-pvr-omap/sgx-lib-data/control @@ -1,6 +1,6 @@ Package: sgx-lib-data Source: sgx-lib -Version: 1.9.0.4.1-1glp1 +Version: 1.9.0.4.2-1glp2 Architecture: all Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 41 diff --git a/fetch-pvr-omap/sgx-lib-data/md5sums b/fetch-pvr-omap/sgx-lib-data/md5sums index fd7b4a6..1922ffa 100644 --- a/fetch-pvr-omap/sgx-lib-data/md5sums +++ b/fetch-pvr-omap/sgx-lib-data/md5sums @@ -1,4 +1,4 @@ -0eeb3e149024ed7198f101ba23faa6f1 usr/share/doc/sgx-lib-data/changelog.Debian.gz +15918f54d0121fe351a1e1543ad98b85 usr/share/doc/sgx-lib-data/changelog.Debian.gz 542af8025bb26f9b36a120c00e319748 usr/share/doc/sgx-lib-data/copyright 4d4e77f7b2e1251c25ff172a2d6e927b usr/share/sgx-lib/glsltest1_fragshaderA.txt 209dae6be9437e133b09b776687bd67f usr/share/sgx-lib/glsltest1_fragshaderB.txt diff --git a/fetch-pvr-omap/sgx-lib-dbgsym/control b/fetch-pvr-omap/sgx-lib-dbgsym/control index e728897..83a1a7e 100644 --- a/fetch-pvr-omap/sgx-lib-dbgsym/control +++ b/fetch-pvr-omap/sgx-lib-dbgsym/control @@ -1,7 +1,7 @@ Package: sgx-lib-dbgsym Source: sgx-lib -Version: 1.9.0.4.1-1glp1 -Depends: sgx-lib (= 1.9.0.4.1-1glp1) +Version: 1.9.0.4.2-1glp2 +Depends: sgx-lib (= 1.9.0.4.2-1glp2) Architecture: armhf Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 8920 diff --git a/fetch-pvr-omap/sgx-lib-dev/control b/fetch-pvr-omap/sgx-lib-dev/control index eb861c4..d2d42be 100644 --- a/fetch-pvr-omap/sgx-lib-dev/control +++ b/fetch-pvr-omap/sgx-lib-dev/control @@ -1,10 +1,10 @@ Package: sgx-lib-dev Source: sgx-lib -Version: 1.9.0.4.1-1glp1 +Version: 1.9.0.4.2-1glp2 Architecture: armhf Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 263 -Depends: sgx-lib (= 1.9.0.4.1-1glp1), libx11-dev +Depends: sgx-lib (= 1.9.0.4.2-1glp2), libx11-dev Conflicts: libegl1-mesa-dev, libegl1-sgx-omap4-dev, libegl1-x11-dev, libgles1-dev, libgles1-mesa-dev, libgles1-sgx-omap4-dev, libgles2-dev, libgles2-mesa-dev, libgles2-sgx-omap4-dev Replaces: libegl1-mesa-dev, libegl1-sgx-omap4-dev, libegl1-x11-dev, libgles1-dev, libgles1-mesa-dev, libgles1-sgx-omap4-dev, libgles2-dev, libgles2-mesa-dev, libgles2-sgx-omap4-dev Provides: libegl1-mesa-dev, libegl1-x11-dev, libgles1-dev, libgles1-mesa-dev, libgles2-dev, libgles2-mesa-dev diff --git a/fetch-pvr-omap/sgx-lib-dev/md5sums b/fetch-pvr-omap/sgx-lib-dev/md5sums index 6a2b93f..c97de2f 100644 --- a/fetch-pvr-omap/sgx-lib-dev/md5sums +++ b/fetch-pvr-omap/sgx-lib-dev/md5sums @@ -11,5 +11,5 @@ ffd01f5ec1c582b9df88963dcc9e6df4 usr/include/EGL/eglplatform.h c55edf0b8437bd024d73b333430ff4c1 usr/lib/pkgconfig/egl.pc 4805ddb8cd48e49e2ebe0644eb5cef92 usr/lib/pkgconfig/glesv1_cm.pc 4204e526e5f0f24ef1da9b3a224db869 usr/lib/pkgconfig/glesv2.pc -0eeb3e149024ed7198f101ba23faa6f1 usr/share/doc/sgx-lib-dev/changelog.Debian.gz +15918f54d0121fe351a1e1543ad98b85 usr/share/doc/sgx-lib-dev/changelog.Debian.gz 542af8025bb26f9b36a120c00e319748 usr/share/doc/sgx-lib-dev/copyright diff --git a/fetch-pvr-omap/sgx-lib/control b/fetch-pvr-omap/sgx-lib/control index 1536958..37a3535 100644 --- a/fetch-pvr-omap/sgx-lib/control +++ b/fetch-pvr-omap/sgx-lib/control @@ -1,9 +1,9 @@ Package: sgx-lib -Version: 1.9.0.4.1-1glp1 +Version: 1.9.0.4.2-1glp2 Architecture: armhf Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 1879 -Depends: libc6 (>= 2.15-0ubuntu8), libdri2-1 (>= 1.0.2-0ubuntu3), libdrm-omap1 (>= 2.4.32-1ubuntu1+ti3.0), libdrm2 (>= 2.3.1), libgcc1 (>= 1:4.4.0), libstdc++6 (>= 4.1.1), libx11-6, libxfixes3, sgx-lib-data (= 1.9.0.4.1-1glp1), libpixman-1-0 +Depends: libc6 (>= 2.15-0ubuntu8), libdri2-1 (>= 1.0.2-0ubuntu3), libdrm-omap1 (>= 2.4.32-1ubuntu1+ti3.0), libdrm2 (>= 2.3.1), libgcc1 (>= 1:4.4.0), libstdc++6 (>= 4.1.1), libx11-6, libxfixes3, sgx-lib-data (= 1.9.0.4.2-1glp2), libpixman-1-0 Suggests: sgx-lib-doc Conflicts: libegl1-sgx-omap4, libegl1-x11, libgles1, libgles1-sgx-omap4, libgles2, libgles2-sgx-omap4, pvr-omap4, pvr-omap4-utils, sgx-lib-noxws, xf86-video-v4l2 Replaces: libegl1-sgx-omap4, libegl1-x11, libgles1, libgles1-sgx-omap4, libgles2, libgles2-sgx-omap4, pvr-omap4, pvr-omap4-utils, sgx-lib-noxws, xf86-video-v4l2 diff --git a/fetch-pvr-omap/sgx-lib/md5sums b/fetch-pvr-omap/sgx-lib/md5sums index 75e3c3c..8dc14a2 100644 --- a/fetch-pvr-omap/sgx-lib/md5sums +++ b/fetch-pvr-omap/sgx-lib/md5sums @@ -5,15 +5,15 @@ f8ff17ba9d927f84f61cc64eafafb3d1 usr/bin/xgles2test1 a93a0bea1f2372e8187c64a36ffa6410 usr/bin/xmultiegltest 641469b5ef8d3728e9eb1139e7eebfaf usr/lib/libEGL.so.1.9.6.0 0e33f03fda86a96c7a226136854c859b usr/lib/libGLESv1_CM.so.1.9.6.0 -08c746251f121f562980cf42fadb5970 usr/lib/libGLESv2.so.1.9.6.0 +e4d200310ae47cb6472e1b92b1afd449 usr/lib/libGLESv2.so.1.9.6.0 56f60b5281b7f3b2b9182d67abf9880f usr/lib/libIMGegl.so.1.9.6.0 92b78cb132a1dab605e93e31b76c4d80 usr/lib/libPVRScopeServices.so.1.9.6.0 76cc0b51d8fa1aa6e8e056302adf393b usr/lib/libglslcompiler.so.1.9.6.0 b08ff28d955958042d08b729c95bb8ed usr/lib/libpvr2d.so.1.9.6.0 -714b50cdb1f793af5c0fa057986c53ce usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 +11b9730cd85bb54ad46b7b11f4c320ac usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 9ce5fff9862c10fae2d2bbc26c87556c usr/lib/libsrv_init.so.1.9.6.0 1f2023628c8087b9747eb1363e30c52e usr/lib/libsrv_um.so.1.9.6.0 1200e6a723f030b60f13c4db6b620109 usr/lib/libusc.so.1.9.6.0 db1a9b82c1800e75e7401ee9d0497c70 usr/share/X11/xorg.conf.d/99-omap.conf -0eeb3e149024ed7198f101ba23faa6f1 usr/share/doc/sgx-lib/changelog.Debian.gz +15918f54d0121fe351a1e1543ad98b85 usr/share/doc/sgx-lib/changelog.Debian.gz 542af8025bb26f9b36a120c00e319748 usr/share/doc/sgx-lib/copyright diff --git a/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/control b/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/control index 7e80279..6d8aa76 100644 --- a/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/control +++ b/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/control @@ -1,10 +1,10 @@ Package: xserver-xorg-video-omap-pvr-dbg Source: xf86-video-omap-pvr -Version: 0.3.2-0ubuntu1 +Version: 0.3.4-0ubuntu1 Architecture: armhf Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 264 -Depends: xserver-xorg-video-omap-pvr (= 0.3.2-0ubuntu1) +Depends: xserver-xorg-video-omap-pvr (= 0.3.4-0ubuntu1) Conflicts: pvr-omap4-xf86-dbg, xserver-xorg-video-omap-pvr-dbgsym Replaces: pvr-omap4-xf86-dbg, xserver-xorg-video-omap-pvr-dbgsym Section: debug diff --git a/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/md5sums b/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/md5sums index c65f275..0a00caf 100644 --- a/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/md5sums +++ b/fetch-pvr-omap/xserver-xorg-video-omap-pvr-dbg/md5sums @@ -1 +1 @@ -bb6ee76fb7ee49a8b98c12bf662725fa usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so +cb1e9380c38c5146a9f0e57e25aa9fd8 usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so diff --git a/fetch-pvr-omap/xserver-xorg-video-omap-pvr/control b/fetch-pvr-omap/xserver-xorg-video-omap-pvr/control index 86fa39d..5630c61 100644 --- a/fetch-pvr-omap/xserver-xorg-video-omap-pvr/control +++ b/fetch-pvr-omap/xserver-xorg-video-omap-pvr/control @@ -1,6 +1,6 @@ Package: xserver-xorg-video-omap-pvr Source: xf86-video-omap-pvr -Version: 0.3.2-0ubuntu1 +Version: 0.3.4-0ubuntu1 Architecture: armhf Maintainer: TI OMAP Developers <tiomap-dev@lists.launchpad.net> Installed-Size: 100 diff --git a/fetch-pvr-omap/xserver-xorg-video-omap-pvr/md5sums b/fetch-pvr-omap/xserver-xorg-video-omap-pvr/md5sums index d512a0c..abb14bf 100644 --- a/fetch-pvr-omap/xserver-xorg-video-omap-pvr/md5sums +++ b/fetch-pvr-omap/xserver-xorg-video-omap-pvr/md5sums @@ -1,3 +1,3 @@ -8dbd0e9ef8e52944807fb4421148c0be usr/lib/xorg/modules/drivers/omap_pvr_drv.so -b1727af1b823d63aaa9ed92aa6d045a6 usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz +5cc323f5d2a5d0b44b588bd0acdba57f usr/lib/xorg/modules/drivers/omap_pvr_drv.so +9a6d56934e0693f78b55787080782837 usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz e2f52fd70fc08d7f6decc136ca2b3937 usr/share/doc/xserver-xorg-video-omap-pvr/copyright diff --git a/usr/lib/debug/usr/lib/libGLESv2.so.1.9.6.0 b/usr/lib/debug/usr/lib/libGLESv2.so.1.9.6.0 Binary files differindex e63e09e..c5fa3e0 100755 --- a/usr/lib/debug/usr/lib/libGLESv2.so.1.9.6.0 +++ b/usr/lib/debug/usr/lib/libGLESv2.so.1.9.6.0 diff --git a/usr/lib/debug/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 b/usr/lib/debug/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 Binary files differindex 0f2741c..2f17c19 100755 --- a/usr/lib/debug/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 +++ b/usr/lib/debug/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 diff --git a/usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so b/usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so Binary files differindex 74c1129..4400756 100644 --- a/usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so +++ b/usr/lib/debug/usr/lib/xorg/modules/drivers/omap_pvr_drv.so diff --git a/usr/lib/libGLESv2.so.1.9.6.0 b/usr/lib/libGLESv2.so.1.9.6.0 Binary files differindex 3c601a4..81d96ee 100644 --- a/usr/lib/libGLESv2.so.1.9.6.0 +++ b/usr/lib/libGLESv2.so.1.9.6.0 diff --git a/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 b/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 Binary files differindex 509a5c0..76f19a9 100644 --- a/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 +++ b/usr/lib/libpvrws_OMAPDRI2.so.1.9.6.0 diff --git a/usr/lib/xorg/modules/drivers/omap_pvr_drv.so b/usr/lib/xorg/modules/drivers/omap_pvr_drv.so Binary files differindex 3097299..8fc45b6 100644 --- a/usr/lib/xorg/modules/drivers/omap_pvr_drv.so +++ b/usr/lib/xorg/modules/drivers/omap_pvr_drv.so diff --git a/usr/share/doc/sgx-lib-data/changelog.Debian.gz b/usr/share/doc/sgx-lib-data/changelog.Debian.gz Binary files differindex ef9a27e..59e57ea 100644 --- a/usr/share/doc/sgx-lib-data/changelog.Debian.gz +++ b/usr/share/doc/sgx-lib-data/changelog.Debian.gz diff --git a/usr/share/doc/sgx-lib-dev/changelog.Debian.gz b/usr/share/doc/sgx-lib-dev/changelog.Debian.gz Binary files differindex ef9a27e..59e57ea 100644 --- a/usr/share/doc/sgx-lib-dev/changelog.Debian.gz +++ b/usr/share/doc/sgx-lib-dev/changelog.Debian.gz diff --git a/usr/share/doc/sgx-lib/changelog.Debian.gz b/usr/share/doc/sgx-lib/changelog.Debian.gz Binary files differindex ef9a27e..59e57ea 100644 --- a/usr/share/doc/sgx-lib/changelog.Debian.gz +++ b/usr/share/doc/sgx-lib/changelog.Debian.gz diff --git a/usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz b/usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz Binary files differindex 10310cb..d5b518c 100644 --- a/usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz +++ b/usr/share/doc/xserver-xorg-video-omap-pvr/changelog.Debian.gz |