- updated to 20190916 snap; now uses meson and sets soname

- removed outdated mm patch

diff --git a/mrg-mm.patch b/mrg-mm.patch
deleted file mode 100644 (file)
index 22f968f..0000000
--- a/mrg-mm.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/Makefile mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/Makefile
---- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/Makefile 2019-03-22 02:34:36.000000000 +0100
-+++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/Makefile      2019-04-09 07:39:01.369907820 +0200
-@@ -69,7 +69,7 @@
- 
- install: install-extra
- install-extra:
--      install mrg-host mrg-terminal mrg-edit mrg-browser $(DESTDIR)$(PREFIX)/bin/
-+      cp -a mrg-host mrg-terminal mrg-edit mrg-browser $(DESTDIR)$(PREFIX)/bin/
- 
- luajit/mrg_h.lua: lib/*.h Makefile
-       echo "local ffi = require'ffi'" > $@
-diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/bin mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/bin
---- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/bin  2019-03-22 02:34:36.000000000 +0100
-+++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/bin       2019-04-09 07:36:36.485673498 +0200
-@@ -12,11 +12,11 @@
- BIN_LD_FLAGS += $(shell test "$(BIN_PKGMODULES)" 2>/dev/null && pkg-config $(BIN_PKGMODULES) --libs)
- 
- $(BINARY): $(BIN_CFILES) $(LIBNAME_A)
--      @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)  \
-+      echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)  \
-               $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -o $@
- 
- $(BINARY).efence: $(BIN_CFILES) $(LIBNAME_A) 
--      @echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)  \
-+      echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS)  \
-               $(BIN_CFILES) $(LIBNAME_A) $(BIN_LD_FLAGS) -lefence -o $@
- 
- all: $(BIN_TARGETS)
-diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/lib mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/lib
---- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/lib  2019-03-22 02:34:36.000000000 +0100
-+++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/lib       2019-04-09 07:38:13.704082927 +0200
-@@ -16,23 +16,23 @@
- LIBNAME_A=$(LIBNAME).a
- 
- $(LIBNAME).a: $(LIB_OBJS)
--      @echo "  AR" $@;ar rcs $@ $(LIB_OBJS)
-+      echo "  AR" $@;ar rcs $@ $(LIB_OBJS)
- 
- CLEAN_FILES += symbols
- 
- symbols: Makefile $(LIB_OBJS)
--      @echo " gen" $@;  nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' | grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
-+      echo " gen" $@;  nm -a $(LIB_OBJS) | grep " T " | cut -f 3 -d ' ' | grep "^$(SYMBOL_PREFIX)" | grep -v "^_" | sort > $@
- 
- $(LIBNAME).$(LIBEXT): $(LIB_OBJS) symbols
--      @echo "  LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
-+      echo "  LD" $@;$(CC) --shared $(LIB_OBJS) -o $@ $(LIB_LD_FLAGS)
- 
- # this rule is generic and could also belong with bin..
- # we try to be overly generic and throw in the cflags of both lib and bin..
- %.o: %.c *.h $(LIB_HFILES)
--      @echo "  CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
-+      echo "  CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
- 
- lib/%.o: lib/%.c lib/*.h $(LIB_HFILES)
--      @echo "  CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
-+      echo "  CC" $@;$(CC) $(SYSROOT) -c $(LIB_CFLAGS) $< -o $@
- 
- LIBDIR ?= $(PREFIX)/lib
- #$(P64)
-@@ -71,12 +71,12 @@
- EXAMPLES_LD_FLAGS += $(shell test "$(EXAMPLES_PKGMODULES)" 2>/dev/null && pkg-config $(EXAMPLES_PKGMODULES) --libs | sed 's/-Wl,--export-dynamic//' | sed 's/-pthread//')
- 
- examples/%: examples/%.c $(LIBNAME).a
--      @echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS) $< $(LIBNAME).a $(EXAMPLES_LD_FLAGS) $(LIB_LD_FLAGS) -o $@
-+      echo "CCLD" $@; $(CC) -I.. -I. $(EXAMPLES_CFLAGS) $(LIB_CFLAGS) $< $(LIBNAME).a $(EXAMPLES_LD_FLAGS) $(LIB_LD_FLAGS) -o $@
- 
- 
- all: $(EXAMPLES_BINS)
- CLEAN_FILES += $(EXAMPLES_BINS)
- help: _libhelp
- _libhelp:
--      @echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
--      @echo "$(LIBNAME).a         static library"
-+      echo "$(LIBNAME).$(LIBEXT) dynamic shared library"
-+      echo "$(LIBNAME).a         static library"
-diff -burN mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/pkgconfig mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/pkgconfig
---- mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361.orig/.mm/pkgconfig    2019-03-22 02:34:36.000000000 +0100
-+++ mrg-ba04b1ee9c63cbd50ea0ac9211fad881a0724361/.mm/pkgconfig 2019-04-09 07:38:42.905609331 +0200
-@@ -6,7 +6,7 @@
-       @echo " gen" $@
-       @echo "prefix=$(PREFIX)"     > $@
-       @echo exec_prefix=\$${prefix} >> $@
--      @echo libdir=\$${prefix}/lib >> $@
-+      @echo "libdir=$(LIBDIR)" >> $@
-       @echo includedir=\$${prefix}/include >> $@
-       @echo apiversion=$(API_VERSION) >> $@
-       @echo >> $@

diff --git a/mrg.spec b/mrg.spec
index c27d675b1a61fddf426ca891ee3ea1419517f26d..917a89e8ea9b06473ef22c838e4a2b187046fe3b 100644 (file)
--- a/mrg.spec
+++ b/mrg.spec
@@ -2,20 +2,21 @@ Summary:      Microraptor GUI
 Summary(pl.UTF-8):     Microraptor GUI - graficzny interfejs użytkownika
 Name:          mrg
 Version:       0.1.2
-%define        gitref  ba04b1ee9c63cbd50ea0ac9211fad881a0724361
-%define                snap    20190322
+%define        gitref  ae40b7150f5e050469727641767c253214210114
+%define                snap    20190916
 Release:       1.%{snap}.1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://github.com/hodefoting/mrg/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5: 5a2009b7431e6baeb067cce61851833f
-Patch0:                %{name}-mm.patch
+# Source0-md5: 9ba3ffbae7965e77c2e0dd8099f8d97e
 Patch1:                %{name}-format.patch
 URL:           https://github.com/hodefoting/mrg/
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: alsa-lib-devel
 BuildRequires: cairo-devel
-BuildRequires: mmm-devel >= 0-0.20171127.1
+BuildRequires: meson >= 0.50.0
+BuildRequires: ninja >= 1.5
+BuildRequires: mmm-devel >= 0-0.20191113.1
 BuildRequires: gtk+3-devel >= 3.0
 BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,6 +38,7 @@ edytor tekstu.
 Summary:       Shared mrg library
 Summary(pl.UTF-8):     Biblioteka współdzielona mrg
 Group:         Libraries
+Requires:      mmm-libs >= 0-0.20191113.1
 
 %description libs
 Shared mrg library.
@@ -51,7 +53,7 @@ Group:                Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      alsa-lib-devel
 Requires:      cairo-devel
-Requires:      mmm-devel >= 0-0.20171127.1
+Requires:      mmm-devel >= 0-0.20191113.1
 Requires:      gtk+3-devel >= 3.0
 
 %description devel
@@ -74,25 +76,17 @@ Statyczna biblioteka mrg.
 
 %prep
 %setup -q -n %{name}-%{gitref}
-%patch0 -p1
 %patch1 -p1
 
 %build
-# not autoconf configure
-./configure \
-       CFLAGS="%{rpmcflags} -std=gnu99"\
-       --prefix=%{_prefix} \
-       --libdir=%{_libdir}
-%{__make} \
-       CC="%{__cc}" \
-       LD="%{__cc}" \
-       LD_FLAGS="%{rpmldflags}"
+%meson build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,10 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md
 %attr(755,root,root) %{_bindir}/mrg
-%attr(755,root,root) %{_bindir}/mrg-browser
-%attr(755,root,root) %{_bindir}/mrg-edit
-%attr(755,root,root) %{_bindir}/mrg-host
-%attr(755,root,root) %{_bindir}/mrg-terminal
 
 %files libs
 %defattr(644,root,root,755)
@@ -115,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/mrg
+%{_includedir}/mrg-0.0
 %{_pkgconfigdir}/mrg.pc
 
 %files static