sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (53a2a57b3840ce866629612369eafdb5b9300400)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53a2a57b3840ce866629612369eafdb5b9300400)
- Date: Mon, 23 Jul 2018 20:08:40 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
editors/vim/DETAILS | 4
editors/vim/HISTORY | 3
graphics-libs/babl/DETAILS | 4
graphics-libs/babl/HISTORY | 3
graphics-libs/gegl/DETAILS | 4
graphics-libs/gegl/HISTORY | 3
graphics/libgphoto2/DETAILS | 4
graphics/libgphoto2/HISTORY | 3
python-pypi/numpy/DETAILS | 4
python-pypi/numpy/HISTORY | 3
python-pypi/pip/DETAILS | 4
python-pypi/pip/HISTORY | 3
science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch | 82
----------
science/gdal/DETAILS | 4
science/gdal/HISTORY | 4
science/gdal/PRE_BUILD | 4
science/proj/DETAILS | 8
science/proj/HISTORY | 3
science/routino/0001-use-our-CFLAGS-honour-installation-path.patch | 67
++++----
science/routino/DEPENDS | 3
science/routino/DETAILS | 4
science/routino/HISTORY | 5
video/mpv/CONFIGURE | 4
video/mpv/DEPENDS | 5
video/mpv/DETAILS | 4
video/mpv/HISTORY | 5
x11/colord/BUILD | 1
x11/colord/CONFIGURE | 1
x11/colord/DEPENDS | 1
x11/colord/DETAILS | 2
x11/colord/HISTORY | 4
x11/colord/INSTALL | 1
32 files changed, 105 insertions(+), 149 deletions(-)
New commits:
commit 53a2a57b3840ce866629612369eafdb5b9300400
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/libgphoto2: version 2.5.19
commit 6e5e4219956acd57d74d8dc9362de99669112a1d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/gegl: version 0.4.6
commit 77bcad6a94f99047e026333fceae8de8b947f6db
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics-libs/babl: version 0.1.54
commit 65fbc31a32b35a292831ee156c4d60fdd6d4f503
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/mpv: version 0.29.0
commit a4e96d508b8249c9047caa053e094f83d113f2ba
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/numpy: version 1.15.0
commit 0fab1b7647020698062e3cb08eafad47a0bd224b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/pip: version 18.0
commit d9ea047ebc8c7f8e4fc9c94ea4389b414bdfacc9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
editors/vim: version 8.1.0207
commit 4f4d2def9d9a566cc1b76245a9aaf4b015f2704f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
x11/colord: version 1.4.3
commit 6e3815f1fdc9f3d8a6e655c63958bd9c9da1a16e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/proj: version 5.1.0
commit 239d83cd040268d931d2b7bc98e67d3939d106c9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/gdal: version 2.3.1
commit e36e1aa3fe4e7377eff3218e424cf996343a298c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/routino: version 3.2
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 4f98f14..ccb8f98 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- VERSION=8.1.0181
+ VERSION=8.1.0207
SECURITY_PATCH=4
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:cbe25abe33728b189179463e941ea7797654c1a72bbc0ce62bb23126cb40baf94fb82df89c690f77943d96873edd06798465e19c96b6c1599f513ed716c2d6ec
+
SOURCE_HASH=sha512:c039ebc91a3e93127c85869f2388dd5e896685b573c6ed3177557f775c9c404eddfde3da7bce6ac419524cd3ba6cb7da144124c86e4da2d446ef67b3f75b58d0
fi
WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 3d8b4a7..42e8935 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.1.0207
+
2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.1.0181
diff --git a/graphics-libs/babl/DETAILS b/graphics-libs/babl/DETAILS
index 1fc201d..b50a15c 100755
--- a/graphics-libs/babl/DETAILS
+++ b/graphics-libs/babl/DETAILS
@@ -1,7 +1,7 @@
SPELL=babl
- VERSION=0.1.52
+ VERSION=0.1.54
SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_HASH=sha512:39fddb2393e4533665c444ab77105966f86c2938a3b48ca7683ccaecefe0c1b8b08374f0028360ccd05b0d03848dfadba54c7bd9d73ef40549c4e0501e61785f
+
SOURCE_HASH=sha512:91406c4e6f3fc6167ae68760c14e391707177f6e5afde49e09fa90cb70d25cf69e71d1de9cd8e96a6944aa49a44f28deffa86821d93de79cfa3faa95ec5b174e
SOURCE_URL[0]=https://download.gimp.org/pub/${SPELL}/${VERSION%.*}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gegl.org/babl/";
diff --git a/graphics-libs/babl/HISTORY b/graphics-libs/babl/HISTORY
index 912ac09..70a7bc5 100644
--- a/graphics-libs/babl/HISTORY
+++ b/graphics-libs/babl/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.1.54
+
2018-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.1.52
diff --git a/graphics-libs/gegl/DETAILS b/graphics-libs/gegl/DETAILS
index 5833887..78ad615 100755
--- a/graphics-libs/gegl/DETAILS
+++ b/graphics-libs/gegl/DETAILS
@@ -1,7 +1,7 @@
SPELL=gegl
- VERSION=0.4.4
+ VERSION=0.4.6
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:6953bf7df225914ce9c8166f5a0490615664c69d5a66cf8ca805f75cfbe272186c7745d273fcde29c685e22a66d4483dbdf45064ec9c0007fd6d0b8aa3ebb164
+
SOURCE_HASH=sha512:6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
SOURCE_URL[0]=https://download.gimp.org/pub/$SPELL/${VERSION%.*}/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://gegl.org/
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index 77386fe..1a0221c 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.6
+
2018-07-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.4.4
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 5f633c1..83be3fb 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgphoto2
- VERSION=2.5.18
-
SOURCE_HASH=sha512:f53596a8e520c200d5a779351db9c77e4fe80f39aec9acc4997403e105dc4e8eafaee6b20d1612df14f2cd645c9f95d86561092c77b49868d6c918415be3258d
+ VERSION=2.5.19
+
SOURCE_HASH=sha512:0c26613b5e6041955198760f40cf21c302eaf8d3776642cc23e527da576cae01c7dd6eccd091b4c3dd7d592fa5114378858f42fc4ec0cb8bb82791feb4c97e2c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/gphoto/libgphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index f02cacd..e9e1034 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.19
+
2018-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.5.18
diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index 55ad2ed..38209dd 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,7 +1,7 @@
SPELL=numpy
- VERSION=1.14.5
+ VERSION=1.15.0
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:7826b0a9913873efd8b06e0898e0714dc2eb11a224761569b258bf8df7127c20b69626bc19978054859a30953e2c54de3d4180bbd90663b07ab8482594c50374
+
SOURCE_HASH=sha512:1ee1c6cdf4ae287f1a0e7c49533c143c5842817cd92681cf72507f32904866de2e1fdca648f09fdca9fae391c78cebdd9a32a7116ff10ca3887f6f5ab18763b2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://github.com/numpy/numpy/archive/v${VERSION}.tar.gz
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index 3ca0acc..a09d62e 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: verison 1.15.0
+
2018-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: verison 1.14.5
diff --git a/python-pypi/pip/DETAILS b/python-pypi/pip/DETAILS
index fb75850..0ad25ab 100755
--- a/python-pypi/pip/DETAILS
+++ b/python-pypi/pip/DETAILS
@@ -1,6 +1,6 @@
SPELL=pip
- VERSION=10.0.1
-
SOURCE_HASH=sha512:a7266504d76f26490d62c7144f42234307db88fe49971dada1ca2d734e4d75edc84fc3da2b38ab5d6da6e5f7ef0e248ccbc5aab9f845e71ce48962687673e2c4
+ VERSION=18.0
+
SOURCE_HASH=sha512:c8cedd6def77e9f96b79a1493d30ae8d95df7d06547980de0d105db0c8a5eff7710a1e55438834e97392b6a78702a8b3169cca8127572981129c30534646f975
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=https://github.com/pypa/pip/archive/$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/pip/HISTORY b/python-pypi/pip/HISTORY
index c403e71..83194a9 100644
--- a/python-pypi/pip/HISTORY
+++ b/python-pypi/pip/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 18.0
+
2018-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 10.0.1
diff --git
a/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
b/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
deleted file mode 100644
index a796d6a..0000000
--- a/science/gdal/0001-fix-compile-error-due-to-missing-uchar-type.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 3782d6e5056e2c2704a339f653a9c6c1b669af61 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sat, 14 Jan 2017 21:08:33 +0100
-Subject: [PATCH] fix compile error due to missing uchar type
-
----
- frmts/jpeg2000/jpeg2000_vsil_io.cpp | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 74f1e64..f478558 100644
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -9,7 +9,7 @@
-
- /* Following code is mostly derived from jas_stream.c, which is licensed */
- /* under the below terms */
--
-+
- /*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- * British Columbia.
-@@ -19,15 +19,15 @@
- */
-
- /* __START_OF_JASPER_LICENSE__
-- *
-+ *
- * JasPer License Version 2.0
-- *
-+ *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
-- *
-+ *
- * All rights reserved.
-- *
-+ *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
-@@ -35,15 +35,15 @@
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
-- *
-+ *
- * 1. The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
-- *
-+ *
- * 2. The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
-- *
-+ *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
-@@ -70,7 +70,7 @@
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
-- *
-+ *
- * __END_OF_JASPER_LICENSE__
- */
-
-@@ -209,7 +209,7 @@ static void
JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode,
- /* The buffer must be large enough to accommodate
maximum
- putback. */
- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-+ stream->bufbase_ = JAS_CAST(unsigned char *, buf);
- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
- }
- } else {
---
-2.11.0
-
diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index b692023..80c6958 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,6 +1,6 @@
SPELL=gdal
- VERSION=2.1.2
-
SOURCE_HASH=sha512:fbd43a090d1343256e3a77ee3e36c897c7f27a983d925f36688ba43cdb7c8ee305a532ff9005e945dc32ec3f840e32cad214d6d144d716696cdbdb5259d3b3cd
+ VERSION=2.3.1
+
SOURCE_HASH=sha512:9c016788478d15155d8be69eac2988a31bd59bd8dc6ef440cef71c833a3f9563cdb37e6c9b2219eb416f9e11bed199268469e15f3228c520dc6e74f1ce2fdbf3
SOURCE="$SPELL-$VERSION.tar.xz"
SOURCE_URL[0]=http://download.osgeo.org/$SPELL/$VERSION/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 5168e99..d386623 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,7 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.1
+ * 0001-fix-compile-error-due-to-missing-uchar-type.patch, PRE_BUILD:
removed
+
2017-01-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.2
* PRE_BUILD, 0001-fix-compile-error-due-to-missing-uchar-type.patch:
fix
diff --git a/science/gdal/PRE_BUILD b/science/gdal/PRE_BUILD
deleted file mode 100755
index da7ab89..0000000
--- a/science/gdal/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 <
"$SPELL_DIRECTORY/0001-fix-compile-error-due-to-missing-uchar-type.patch"
diff --git a/science/proj/DETAILS b/science/proj/DETAILS
index d2d33dd..e25ec0e 100755
--- a/science/proj/DETAILS
+++ b/science/proj/DETAILS
@@ -1,12 +1,12 @@
SPELL=proj
- VERSION=4.7.0
+ VERSION=5.1.0
SOURCE="$SPELL-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.osgeo.org/proj/${SOURCE}
-
SOURCE_HASH=sha512:fb1e2653c399b15cf323e63ef122af87daaae9bc19616558cd104d5a11f76967a5cffbe731ebaf2bd5f783b83bafa6a74d59a9376b2c68d2a9b1c7a97b82b469
- DGVER=1.5
+
SOURCE_HASH=sha512:6e851485c03ca0b3b82e1dcff88a024990551919e203083c46ce6d14f824daed89fa774a2edf1ec543370a3f9792d6502f3037992496984912d8fa4ba7a37859
+ DGVER=1.7
SOURCE2="proj-datumgrid-$DGVER.zip"
SOURCE2_URL[0]=http://download.osgeo.org/proj/$SOURCE2
-
SOURCE2_HASH=sha512:9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
+
SOURCE2_HASH=sha512:90514f156402b7f0e8eb4d5630f6c74f1566f15ebaec28e3d6a835a59d28551eebbbe390c3b0cbd38611a58037b3cfef73df0ca7b84b047905c15f98ceb2bc0e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-${VERSION}"
WEB_SITE="http://trac.osgeo.org/proj/";
LICENSE[0]="MIT"
diff --git a/science/proj/HISTORY b/science/proj/HISTORY
index 1b0f89a..f94465e 100644
--- a/science/proj/HISTORY
+++ b/science/proj/HISTORY
@@ -1,3 +1,6 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.1.0, datum-grid version 1.7
+
2012-06-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.7.0, 4.8.0 is incompatible with ogdi
diff --git
a/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
index 5c9d52a..2e9d36d 100644
--- a/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
+++ b/science/routino/0001-use-our-CFLAGS-honour-installation-path.patch
@@ -1,21 +1,22 @@
-From b39f4b6b732f3f13b031e34548d8908399be5cee Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sat, 6 Feb 2016 12:39:48 +0100
+From dba0c127bacf334b6255d51ef21564ff99fb66a7 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 23 Jul 2018 18:48:55 +0200
Subject: [PATCH] use our CFLAGS, honour installation path
---
- Makefile.conf | 28 ++++------------------------
- 1 file changed, 4 insertions(+), 24 deletions(-)
+ Makefile.conf | 19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile.conf b/Makefile.conf
-index cc112e0..7e38466 100644
+index a1cfb24..a7aea84 100644
--- a/Makefile.conf
+++ b/Makefile.conf
-@@ -45,11 +45,10 @@ endif
+@@ -45,11 +45,11 @@ endif
# Installation locations (edit if required)
ifneq ($(HOST),MINGW)
-prefix=/usr/local
++prefix=/usr
bindir=$(prefix)/bin
incdir=$(prefix)/include
libdir=$(prefix)/lib
@@ -24,38 +25,33 @@ index cc112e0..7e38466 100644
datadir=$(prefix)/share/routino
else
prefix="c:/Program Files/Routino"
-@@ -60,28 +59,9 @@ docdir=$(prefix)/doc
- datadir=$(prefix)/xml
- endif
+@@ -69,23 +69,18 @@ LIBVERSION=$(SOVERSION).0.0
-+LD=$(CC)
--# Compilation programs
+ # Compilation programs
-CC=gcc
-LD=gcc
--
--
--# Language dialect selection
++LD=$(CC)
+
+
+ # Maths library
+ LDFLAGS=-lm
+
+ # Language dialect selection
-CFLAGS=-std=c99
--
--# Warning options
--CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
--
++CFLAGS+=-std=c99
+
+ # Warning options
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+
-# Optimisation options
-CFLAGS+=-O3
-CFLAGS+=-ffast-math
-
--# Optimisation option (only works if compilation and execution use exactly
the same CPU architecture).
--#CFLAGS+=-march=native
--
--# Debugging symbols
--#CFLAGS+=-g
--
-+CFLAGS+=-std=c99
+ # Optimisation option (only works if compilation and execution use exactly
the same CPU architecture).
+ #CFLAGS+=-march=native
- # Maths library
- LDFLAGS=-lm
-@@ -103,7 +83,7 @@ LDFLAGS_LDSO=-Wl,-R.
+@@ -123,7 +118,7 @@ LDFLAGS_LDSO=-Wl,-R.
# Required for multi-threaded support (comment these two lines out if not
required)
CFLAGS+=-pthread -DUSE_PTHREADS
@@ -64,6 +60,17 @@ index cc112e0..7e38466 100644
ifneq ($(HOST),MINGW)
+@@ -139,8 +134,8 @@ LDFLAGS+=-lz
+
+
+ # Required for xz support (uncomment these two lines if required)
+-#CFLAGS+=-DUSE_XZ
+-#LDFLAGS+=-llzma
++CFLAGS+=-DUSE_XZ
++LDFLAGS+=-llzma
+
+
+ # Required to use stdio with files > 2GiB on 32-bit system.
--
-2.7.0
+2.18.0
diff --git a/science/routino/DEPENDS b/science/routino/DEPENDS
index ac91798..5cfeda0 100755
--- a/science/routino/DEPENDS
+++ b/science/routino/DEPENDS
@@ -1,4 +1,5 @@
depends gcc &&
depends make &&
depends zlib &&
-depends bzip2
+depends bzip2 &&
+depends LZMA
diff --git a/science/routino/DETAILS b/science/routino/DETAILS
index cc3a695..fdd2551 100755
--- a/science/routino/DETAILS
+++ b/science/routino/DETAILS
@@ -1,8 +1,8 @@
SPELL=routino
- VERSION=3.0
+ VERSION=3.2
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://www.${SPELL}.org/download/${SOURCE}
-
SOURCE_HASH=sha512:7335d41cdd1abdb3e5c5f4e4efb73cc233fb6d1189cb7b5af398c3176c3786558bb741f66a1425ddb9e78b5fe4d1dbc5f06d212443300cf53e74b919c02bed4a
+
SOURCE_HASH=sha512:f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.routino.org";
LICENSE[0]=AGPL
diff --git a/science/routino/HISTORY b/science/routino/HISTORY
index 0c53358..124bbbf 100644
--- a/science/routino/HISTORY
+++ b/science/routino/HISTORY
@@ -1,3 +1,8 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.2
+ * DEPENDS: add dependency on LZMA
+ * 0001-use-our-CFLAGS-honour-installation-path.patch: regenerate
+
2016-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-use-our-CFLAGS-honour-installation-path.patch, BUILD, DEPENDS,
DETAILS, INSTALL, PRE_BUILD: spell created
diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE
index 46ed16c..a6a819e 100755
--- a/video/mpv/CONFIGURE
+++ b/video/mpv/CONFIGURE
@@ -4,10 +4,6 @@ config_query_option MPV_OPTS "Compile-in debugging
information?" y \
"--enable-debug-build" \
"--disable-debug-build" &&
-config_query_option MPV_OPTS "Enable encoding functionality?" y \
- "--enable-encoding" \
- "--disable-encoding" &&
-
config_query_option MPV_OPTS "Enable DVB (Digital Video Broadcast) support?"
y \
"--enable-dvb" \
"--disable-dvb" &&
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index 429b9fd..5e7d050 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -39,11 +39,6 @@ optional_depends openal \
"--disable-openal" \
"for OpenAL audio output" &&
-optional_depends sdl \
- "--enable-sdl1" \
- "--disable-sdl1" \
- "for SDL audio output" &&
-
optional_depends sdl2 \
"--enable-sdl2" \
"--disable-sdl2" \
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 35aaa11..71e0c0a 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,6 +1,6 @@
SPELL="mpv"
- VERSION="0.28.2"
-
SOURCE_HASH="sha512:e6206e8c65dca084e2cfa73ab09278b7113cdfd90b89877d1f75a1068c6379a093ea3955a023857357683edce1aba8c12ee441fd195d887af4d939fc7b66cef4"
+ VERSION="0.29.0"
+
SOURCE_HASH="sha512:77204218bd217ae1da4812b09e0509965a3ef102d3de5cd4360f007ccf3779e4cbde5cfd6adae9629ea39062bd365e847429bdf7f9a1ddebd0a67d267492b221"
SECURITY_PATCH="2"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="https://github.com/${SPELL}-player/${SPELL}/archive/v${VERSION}.tar.gz";
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index c267e5f..1ee6d68 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,8 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.29.0
+ * DEPENDS: remove optional dependency on sdl
+ * CONFIGURE: remove encoding switch
+
2018-05-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: removed 0.27.2 version, ffmpeg is now supported by 0.28.2+
only
diff --git a/x11/colord/BUILD b/x11/colord/BUILD
new file mode 100755
index 0000000..6d39fae
--- /dev/null
+++ b/x11/colord/BUILD
@@ -0,0 +1 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
diff --git a/x11/colord/CONFIGURE b/x11/colord/CONFIGURE
new file mode 100755
index 0000000..9f48d22
--- /dev/null
+++ b/x11/colord/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/MESON_CONFIGURE"
diff --git a/x11/colord/DEPENDS b/x11/colord/DEPENDS
index 24f0dc1..777059a 100755
--- a/x11/colord/DEPENDS
+++ b/x11/colord/DEPENDS
@@ -4,6 +4,7 @@ depends intltool &&
depends lcms2 &&
depends sqlite &&
depends libgudev &&
+depends meson &&
optional_depends gettext \
'--enable-nls' \
diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index 8df7bf0..39e81ee 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,5 +1,5 @@
SPELL=colord
- VERSION=1.3.5
+ VERSION=1.4.3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 706ac15..3c67dd8 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,3 +1,7 @@
+2018-07-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.3
+ * BUILD, CONFIGURE, INSTALL, DEPENDS: use meson
+
2017-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.5
diff --git a/x11/colord/INSTALL b/x11/colord/INSTALL
new file mode 100755
index 0000000..6d39fae
--- /dev/null
+++ b/x11/colord/INSTALL
@@ -0,0 +1 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53a2a57b3840ce866629612369eafdb5b9300400), Florian Franzmann, 07/23/2018
Archive powered by MHonArc 2.6.24.