From 7c28b648226a95f165f582268d6b1979443942cf Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 13 Oct 2019 20:47:04 +1100
Subject: [PATCH] vcdimager: update 0.7.24 --> 2.0.1

fixes #2401
---
 src/vcdimager-1-configure.patch | 53 ---------------------------------
 src/vcdimager.mk                | 14 ++++-----
 2 files changed, 7 insertions(+), 60 deletions(-)
 delete mode 100644 src/vcdimager-1-configure.patch

diff --git a/src/vcdimager-1-configure.patch b/src/vcdimager-1-configure.patch
deleted file mode 100644
index 85a1767d..00000000
--- a/src/vcdimager-1-configure.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-diff -urN vcdimager-0.7.24/configure.ac vcdimager-0.7.24-patch/configure.ac
---- vcdimager-0.7.24/configure.ac	2011-03-18 01:43:53.000000000 +0200
-+++ vcdimager-0.7.24-patch/configure.ac	2013-12-18 10:58:39.175296932 +0200
-@@ -154,9 +154,13 @@
- fi
- 
- if test "x$enable_xml_fe" = "xyes"; then
--  AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
-+  PKG_CHECK_MODULES(XML, libxml-2.0)
-+  dnl Using this causes pain and suffering
-+  dnl AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
- fi
- 
-+
-+
- dnl headers
- 
- dnl AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release)
-diff -urN vcdimager-0.7.24/frontends/xml/Makefile.am vcdimager-0.7.24-patch/frontends/xml/Makefile.am
---- vcdimager-0.7.24/frontends/xml/Makefile.am	2004-08-15 15:16:49.000000000 +0300
-+++ vcdimager-0.7.24-patch/frontends/xml/Makefile.am	2013-12-18 11:07:39.344356593 +0200
-@@ -27,7 +27,7 @@
- 
- MAINTAINERCLEANFILES = $(man_MANS)
- 
--INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
-+INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
- 
- BUILT_SOURCES = videocd_dtd.inc
- MOSTLYCLEANFILES = videocd_dtd.inc
-diff -urN vcdimager-0.7.24/frontends/xml/Makefile.in vcdimager-0.7.24-patch/frontends/xml/Makefile.in
---- vcdimager-0.7.24/frontends/xml/Makefile.in	2011-03-18 01:46:36.000000000 +0200
-+++ vcdimager-0.7.24-patch/frontends/xml/Makefile.in	2013-12-18 11:08:17.458924350 +0200
-@@ -222,7 +222,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- XML2_CONFIG = @XML2_CONFIG@
--XML_CPPFLAGS = @XML_CPPFLAGS@
-+XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
- abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
-@@ -279,7 +279,7 @@
- top_srcdir = @top_srcdir@
- man_MANS = vcdxbuild.1 vcdxgen.1 vcdxrip.1 vcdxminfo.1
- MAINTAINERCLEANFILES = $(man_MANS)
--INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
-+INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
- BUILT_SOURCES = videocd_dtd.inc
- MOSTLYCLEANFILES = videocd_dtd.inc
- EXTRA_DIST = videocd.dtd $(man_MANS)
diff --git a/src/vcdimager.mk b/src/vcdimager.mk
index a2cb5f4f..85cf4426 100644
--- a/src/vcdimager.mk
+++ b/src/vcdimager.mk
@@ -3,21 +3,21 @@
 PKG             := vcdimager
 $(PKG)_WEBSITE  := https://www.gnu.org/software/vcdimager/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.7.24
-$(PKG)_CHECKSUM := 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694
+$(PKG)_VERSION  := 2.0.1
+$(PKG)_CHECKSUM := 67515fefb9829d054beae40f3e840309be60cda7d68753cafdd526727758f67a
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/vcdimager/$(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libcdio libxml2 popt
 
 define $(PKG)_UPDATE
-    echo 'TODO: Updates for package vcdimager need to be written.' >&2;
-    echo $(vcdimager_VERSION)
+    $(call GET_LATEST_VERSION, https://ftp.gnu.org/gnu/vcdimager)
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && autoconf
-    cd '$(1)' && ./configure \
+    # build and install the library
+    cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS)
-    $(MAKE) -C '$(1)' -j 1 install
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS) $(if $(BUILD_SHARED),LDFLAGS=-no-undefined)
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_PROGRAMS)
 endef