From e711c6f3de02b1c23323e7a63107591a88b908ae Mon Sep 17 00:00:00 2001
From: Isaac Yu <isaacyu1@isaacyu1.com>
Date: Sun, 30 Jan 2022 16:18:02 -0800
Subject: Update CDEmu software series

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libmirage/libmirage-3.2.4-gcc-10.patch | 34 ------------------------
 libraries/libmirage/libmirage.SlackBuild         |  8 +++---
 libraries/libmirage/libmirage.info               |  6 ++---
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 libraries/libmirage/libmirage-3.2.4-gcc-10.patch

(limited to 'libraries/libmirage')

diff --git a/libraries/libmirage/libmirage-3.2.4-gcc-10.patch b/libraries/libmirage/libmirage-3.2.4-gcc-10.patch
deleted file mode 100644
index 7834e39eed..0000000000
--- a/libraries/libmirage/libmirage-3.2.4-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7288d06f79d935798b917f707b86a33f5b69125a Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@gmail.com>
-Date: Sat, 2 May 2020 17:37:34 +0200
-Subject: [PATCH] libMirage: utils.h: added missing extern specifiers
-
-The lack thereof seems to be causing errors with gcc 10 on Fedora 32.
----
- libmirage/mirage/utils.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmirage/mirage/utils.h b/libmirage/mirage/utils.h
-index 64611810..fc431d2f 100644
---- a/mirage/utils.h
-+++ b/mirage/utils.h
-@@ -83,8 +83,8 @@ gchar mirage_helper_isrc2ascii (guint8 c);
- gboolean mirage_helper_validate_isrc (const gchar *isrc);
- 
- /* CRC utility functions */
--guint16 *crc16_1021_lut;
--guint32 *crc32_d8018001_lut;
-+extern guint16 *crc16_1021_lut;
-+extern guint32 *crc32_d8018001_lut;
- 
- guint16 *mirage_helper_init_crc16_lut (guint16 genpoly);
- guint32 *mirage_helper_init_crc32_lut (guint32 genpoly, guint slices);
-@@ -139,7 +139,7 @@ const gchar *mirage_helper_encoding_from_bom (const guint8 *buffer);
- 
- 
- /* ECMA-130 Annex B sector data scrambler */
--guint8 *ecma_130_scrambler_lut;
-+extern guint8 *ecma_130_scrambler_lut;
- 
- guint8 *mirage_helper_init_ecma_130b_scrambler_lut (void);
- 
diff --git a/libraries/libmirage/libmirage.SlackBuild b/libraries/libmirage/libmirage.SlackBuild
index 6bb8b88fcd..ab06c5dfe1 100644
--- a/libraries/libmirage/libmirage.SlackBuild
+++ b/libraries/libmirage/libmirage.SlackBuild
@@ -4,7 +4,7 @@
 #
 # Copyright 2008 Niklas "Nille" Åkerström
 # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com>
-# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018-2022 Isaac Yu <isaacyu1@isaacyu1.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libmirage
-VERSION=${VERSION:-3.2.4}
+VERSION=${VERSION:-3.2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -81,8 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/libmirage-3.2.4-gcc-10.patch
-
 mkdir -p build
 cd build
   cmake \
diff --git a/libraries/libmirage/libmirage.info b/libraries/libmirage/libmirage.info
index ca2ae4928d..1474299721 100644
--- a/libraries/libmirage/libmirage.info
+++ b/libraries/libmirage/libmirage.info
@@ -1,8 +1,8 @@
 PRGNAM="libmirage"
-VERSION="3.2.4"
+VERSION="3.2.6"
 HOMEPAGE="https://cdemu.sourceforge.io/about/libmirage/"
-DOWNLOAD="https://downloads.sourceforge.net/cdemu/libmirage-3.2.4.tar.bz2"
-MD5SUM="2be48cbe97ecfd886471038b6c2c3bf2"
+DOWNLOAD="https://downloads.sourceforge.net/cdemu/libmirage-3.2.6.tar.xz"
+MD5SUM="421d251cb7acd615c91f120e957559dd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3-65-gdbad