Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e68f5641d1133d75da82103f443deb9ed2e0032f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e68f5641d1133d75da82103f443deb9ed2e0032f)
  • Date: Thu, 9 Aug 2018 08:00:41 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/mesa/DETAILS | 2
graphics-libs/mesa/HISTORY | 4
graphics-libs/mesa/patches/0001-smgl-fixes.patch | 108
-----------------------
libs/libodfgen/DETAILS | 10 +-
libs/libodfgen/HISTORY | 3
5 files changed, 13 insertions(+), 114 deletions(-)

New commits:
commit e68f5641d1133d75da82103f443deb9ed2e0032f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesa: => 18.2.0-rc2

commit 403d44e3d62ea00fea0e7f79479701f47bd88bdc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libodfgen: => 0.1.7

diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index 1f9f51c..9e67064 100755
--- a/graphics-libs/mesa/DETAILS
+++ b/graphics-libs/mesa/DETAILS
@@ -9,7 +9,7 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=18.2.0-rc1
+ VERSION=18.2.0-rc2
SOURCE=mesa-$VERSION.tar.xz
SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 8b667e9..d02fa2b 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2018-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 18.02.0-rc2
+ * patches/0001-smgl-fixes.patch: delete redundant patch
+
2018-08-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, DEPENDS, PREPARE: added scm branch from mesalib

diff --git a/graphics-libs/mesa/patches/0001-smgl-fixes.patch
b/graphics-libs/mesa/patches/0001-smgl-fixes.patch
deleted file mode 100644
index 436bf69..0000000
--- a/graphics-libs/mesa/patches/0001-smgl-fixes.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 0266415f8382a7e080896ba814d44718cf2cc264 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Mon, 22 May 2017 13:46:44 +0200
-Subject: [PATCH 1/4] smgl fixes
-
----
- src/Makefile.am | 6 +++---
- src/egl/Makefile.am | 6 ++++--
- src/glx/Makefile.am | 3 ++-
- src/mapi/Makefile.am | 6 ++++--
- 4 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index fd5ae44550..0003325953 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -31,7 +31,7 @@ EXTRA_DIST = git_sha1.h.in meson.build
- SUBDIRS = . gtest util mapi/glapi/gen mapi
-
- if HAVE_OPENGL
--gldir = $(includedir)/GL
-+gldir = $(includedir)/GL/.mesa
- gl_HEADERS = \
- $(top_srcdir)/include/GL/gl.h \
- $(top_srcdir)/include/GL/glext.h \
-@@ -40,7 +40,7 @@ gl_HEADERS = \
- endif
-
- if HAVE_GLX
--glxdir = $(includedir)/GL
-+glxdir = $(includedir)/GL/.mesa
- glx_HEADERS = \
- $(top_srcdir)/include/GL/glx.h \
- $(top_srcdir)/include/GL/glxext.h \
-@@ -50,7 +50,7 @@ pkgconfig_DATA = mesa/gl.pc
- endif
-
- if HAVE_COMMON_OSMESA
--osmesadir = $(includedir)/GL
-+osmesadir = $(includedir)/GL/.mesa
- osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
- endif
-
-diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
-index 086a4a1e63..5c0268c672 100644
---- a/src/egl/Makefile.am
-+++ b/src/egl/Makefile.am
-@@ -165,7 +165,8 @@ AM_CFLAGS += \
- vendorjsondir = @LIBGLVND_DATADIR@/glvnd/egl_vendor.d
- vendorjson_DATA = main/50_mesa.json
-
--lib_LTLIBRARIES = libEGL_mesa.la
-+egllibdir = ${libdir}/.mesa
-+egllib_LTLIBRARIES = libEGL_mesa.la
- libEGL_mesa_la_SOURCES = \
- main/eglglvnd.c \
- main/egldispatchstubs.h \
-@@ -184,7 +185,8 @@ libEGL_mesa_la_LDFLAGS = \
-
- else # USE_LIBGLVND
-
--lib_LTLIBRARIES = libEGL.la
-+egllibdir = ${libdir}/.mesa
-+egllib_LTLIBRARIES = libEGL.la
- libEGL_la_SOURCES =
- libEGL_la_LIBADD = \
- libEGL_common.la \
-diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
-index 5233257fb4..7700ef8c7d 100644
---- a/src/glx/Makefile.am
-+++ b/src/glx/Makefile.am
-@@ -50,7 +50,8 @@ AM_CFLAGS = \
- $(GLPROTO_CFLAGS) \
- $(X11_INCLUDES)
-
--lib_LTLIBRARIES = lib@GL_LIB@.la
-+gldir = ${libdir}/.mesa
-+gl_LTLIBRARIES = lib@GL_LIB@.la
-
- noinst_LTLIBRARIES = libglx.la
-
-diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
-index 3da1a193d2..be473fe7cb 100644
---- a/src/mapi/Makefile.am
-+++ b/src/mapi/Makefile.am
-@@ -178,7 +178,8 @@ GLES_include_HEADERS = \
- $(top_srcdir)/include/GLES/glext.h \
- $(top_srcdir)/include/GLES/glplatform.h
-
--lib_LTLIBRARIES += es1api/libGLESv1_CM.la
-+glesdir = ${libdir}/.mesa
-+gles_LTLIBRARIES = es1api/libGLESv1_CM.la
-
- es1api_libGLESv1_CM_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h
- es1api_libGLESv1_CM_la_CFLAGS = \
-@@ -223,7 +224,8 @@ GLES3_include_HEADERS = \
- $(top_srcdir)/include/GLES3/gl3ext.h \
- $(top_srcdir)/include/GLES3/gl3platform.h
-
--lib_LTLIBRARIES += es2api/libGLESv2.la
-+gles2dir = ${libdir}/.mesa
-+gles2_LTLIBRARIES = es2api/libGLESv2.la
-
- es2api_libGLESv2_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h
- es2api_libGLESv2_la_CFLAGS = \
---
-2.17.0
-
diff --git a/libs/libodfgen/DETAILS b/libs/libodfgen/DETAILS
index feb3bc3..92b3795 100755
--- a/libs/libodfgen/DETAILS
+++ b/libs/libodfgen/DETAILS
@@ -1,11 +1,11 @@
SPELL=libodfgen
- VERSION=0.1.6
-
SOURCE_HASH=sha512:4757875d113c11e3aa6e3bdcd93463187bebb94a07eafeb70c3c01b236fff8d3980236c201349abb6bbc99fd027fa627c2efdb7e0f2616dd2435cecbf7c661d1
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.1.7
+
SOURCE_HASH=sha512:eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://dev-www.libreoffice.org/src/${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=https://dev-www.libreoffice.org/src/${SOURCE}
LICENSE[0]=MPL
- WEB_SITE=http://sf.net/p/libwpd/libodfgen
+ WEB_SITE=https://sf.net/p/libwpd/libodfgen
ENTERED=20140215
SHORT="Library for generating documents in Open Document Format"
cat << EOF
diff --git a/libs/libodfgen/HISTORY b/libs/libodfgen/HISTORY
index 51efa48..b8f7cdf 100644
--- a/libs/libodfgen/HISTORY
+++ b/libs/libodfgen/HISTORY
@@ -1,3 +1,6 @@
+2018-08-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.7
+
2016-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.6




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e68f5641d1133d75da82103f443deb9ed2e0032f), Treeve Jelbert, 08/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page