case $MESALIB_BUILD in
dri)
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index ff29e06..c8631b6 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -7,8 +7,8 @@ if [[ "$MESALIB_BRANCH" == "scm" ]]; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
SOURCE_IGNORE=volatile
else
- VERSION=11.0.7
-
SOURCE_HASH=sha512:cf3bae4db0a3af41d075498ad44f1bff994c30e97d58f9f4bdb52d1c6e1244365d68edfa55bf9076f1b4e9f8f4f3de9661f210291a5d8683e280327e1480c7cf
+ VERSION=11.1.0
+
SOURCE_HASH=sha512:49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192
PATCHLEVEL=0
# VX=`echo $VERSION | cut -d. -f-2`
SX=mesa-${VERSION}
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 9692994..4d68d4f 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.1.0
+ * BUILD, DEPENDS: tweak
+
2015-12-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 11.0.7
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index 5092b32..c61d4ce 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=openjpeg
- VERSION=1.5.2
-
SOURCE_HASH=sha512:b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:3da84d7828a82c738f6ea5fe776c989283ba257cc6884aebfc090cee7e33c88471dee1a93f4a87a300b11f43b98f6624b838171f06227add24afcb1d57208df1
SECURITY_PATCH=2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index b5e02db..a1501f6 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,8 @@
+2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0
+ * INSTALL: deleted
+ * UP_TRIGGERS: updated
+
2014-06-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.2
SECURITY_PATCH++
diff --git a/graphics-libs/openjpeg/INSTALL b/graphics-libs/openjpeg/INSTALL
deleted file mode 100755
index 4a50fc6..0000000
--- a/graphics-libs/openjpeg/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-default_install &&
-
-rm $INSTALL_ROOT/usr/share/pkgconfig/libopenjpeg.pc &&
-cd $INSTALL_ROOT/usr/share/pkgconfig &&
-ln -s $INSTALL_ROOT/usr/lib/pkgconfig/libopenjpeg1.pc libopenjpeg.pc
diff --git a/graphics-libs/openjpeg/UP_TRIGGERS
b/graphics-libs/openjpeg/UP_TRIGGERS
index fb874ce..117aae1 100755
--- a/graphics-libs/openjpeg/UP_TRIGGERS
+++ b/graphics-libs/openjpeg/UP_TRIGGERS
@@ -1,17 +1,18 @@
# up_trigger everything on updated to 1.5.1 as soname changed from
libopenjpeg.so.1 to libopenjpeg.so.5
+# .so files now called libopenjp2.so
. "$GRIMOIRE/FUNCTIONS" &&
local OLD_SPELL_VERSION=""
if spell_ok $SPELL; then
OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if is_version_less "${OLD_SPELL_VERSION}" "1.5.1"; then
+ if is_version_less "${OLD_SPELL_VERSION}" "2.1.0"; then
message "This is a possibly incompatible update of $SPELL..."
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL); do
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libopenjpeg\.so\.1"; then
+ grep -q "NEEDED.*libopenjpeg\.so\.?"; then
up_trigger $each cast_self
fi
done
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 4b0a5a1..40b8f90 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,6 +1,7 @@
depends -sub CXX gcc &&
depends fontconfig &&
depends poppler-data &&
+depends openjpeg &&
if [[ $POPPLER_BRANCH == scm ]]; then
depends git
@@ -21,11 +22,6 @@ optional_depends lcms2 \
"--disable-cms" \
"for color management" &&
-optional_depends openjpeg \
- "--enable-libopenjpeg=auto" \
- "--enable-libopenjpeg=none" \
- "for jpeg2000 support" &&
-
optional_depends JPEG \
"--enable-libjpeg" \
"--disable-libjpeg" \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 514197e..166f27d 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,6 +1,7 @@
2015-12-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.39.0
* DEPENDS *SUB_DEPENDS: qt5 support
+ openjpeg is now required
2015-12-05 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.38.0
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e86e69117d47c59a3494c4eb917da381f27150ff),
Treeve Jelbert, 12/17/2015