[packages/mmm] - updated to 20191113 snap; now uses meson and sets soname - removed outdated mm patch - added missi

qboosh qboosh at pld-linux.org
Sun Dec 1 19:34:50 CET 2019 

commit a728b06e93fad4a2f25683dc286f6bb1199fd2cb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 1 19:35:16 2019 +0100

    - updated to 20191113 snap; now uses meson and sets soname
    - removed outdated mm patch
    - added missing patch (disable example with sources missing in git)

 mmm-missing.patch | 10 ++++++++++
 mmm-mm.patch      | 58 -------------------------------------------------------
 mmm.spec          | 28 +++++++++++----------------
 3 files changed, 21 insertions(+), 75 deletions(-)
---
diff --git a/mmm.spec b/mmm.spec
index c7dd805..aaf8c35 100644
--- a/mmm.spec
+++ b/mmm.spec
@@ -2,16 +2,18 @@ Summary:	Memory Mapped Machine
 Summary(pl.UTF-8):	Memory Mapped Machine - sprzęt odwzorowany w pamięci
 Name:		mmm
 Version:	0
-%define	gitref	0ae93f1b2fcc1dc77e3d6029fce89bc1ab115fa0
-%define	snap	20171127
+%define	gitref	58892979d9725a0eda0e3aea373cdefd0b01f6a1
+%define	snap	20191113
 Release:	0.%{snap}.1
 License:	MIT
 Group:		Libraries
 Source0:	https://github.com/hodefoting/mmm/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	b2da0900399bbbd32264d134e18675b9
-Patch0:		%{name}-mm.patch
+# Source0-md5:	dc6459747c3be126c02e48a0b1f62884
+Patch0:		%{name}-missing.patch
 URL:		https://github.com/hodefoting/mmm/
 BuildRequires:	SDL-devel >= 1.2
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,21 +76,14 @@ Statyczna biblioteka mmm.
 %patch0 -p1
 
 %build
-CFLAGS="%{rpmcflags}" \
-LD_FLAGS="%{rpmldflags}" \
-%{__make} \
-	CC="%{__cc}" \
-	LD="%{__cc}" \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir}
+%meson build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir}
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mmm
 %attr(755,root,root) %{_bindir}/mmm.kobo
 %attr(755,root,root) %{_bindir}/mmm.linux
 %attr(755,root,root) %{_bindir}/mmm.sdl
@@ -110,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/mmm
+%{_includedir}/mmm-0.0
 %{_pkgconfigdir}/mmm.pc
 
 %files static
diff --git a/mmm-missing.patch b/mmm-missing.patch
new file mode 100644
index 0000000..652fa55
--- /dev/null
+++ b/mmm-missing.patch
@@ -0,0 +1,10 @@
+--- mmm-58892979d9725a0eda0e3aea373cdefd0b01f6a1/examples/meson.build.orig	2019-11-12 16:01:28.000000000 +0100
++++ mmm-58892979d9725a0eda0e3aea373cdefd0b01f6a1/examples/meson.build	2019-12-01 19:19:14.513929885 +0100
+@@ -8,7 +8,6 @@
+  { 'name': 'fragment-full', },
+  { 'name': 'nano-test2', },
+  { 'name': 'raw-client', },
+- { 'name': 'ctx', },
+  { 'name': 'raw-client-tool', },
+ ]
+ 
diff --git a/mmm-mm.patch b/mmm-mm.patch
deleted file mode 100644
index d901887..0000000
--- a/mmm-mm.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- mmm-0.1.0/.mm/bin.orig	2016-12-19 19:19:18.000000000 +0100
-+++ mmm-0.1.0/.mm/bin	2018-03-24 15:06:16.813108957 +0100
-@@ -12,11 +12,11 @@ BIN_CFLAGS += $(shell test "$(BIN_PKGMOD
- 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) $(BIN_LD_FLAGS)  \
-+	echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) $(BIN_LD_FLAGS)  \
- 		$(BIN_CFILES) $(LIBNAME_A) -o $@
- 
- $(BINARY).efence: $(BIN_CFILES) $(LIBNAME_A) 
--	@echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) $(BIN_LD_FLAGS) \
-+	echo "CCLD" $@; $(CC) $(SYSROOT) -Ilib -I .. $(BIN_CFLAGS) $(BIN_LD_FLAGS) \
- 		$(BIN_CFILES) $(LIBNAME_A) -lefence -o $@
- 
- all: $(BIN_TARGETS)
---- mmm-0.1.0/.mm/lib.orig	2018-03-24 15:06:16.813108957 +0100
-+++ mmm-0.1.0/.mm/lib	2018-03-24 15:08:07.469799580 +0100
-@@ -16,23 +16,23 @@ LIB_LD_FLAGS += $(shell test "$(LIB_PKGM
- 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)
---- mmm-0.1.0/.mm/pkgconfig.orig	2016-12-19 19:19:18.000000000 +0100
-+++ mmm-0.1.0/.mm/pkgconfig	2018-03-24 15:06:16.813108957 +0100
-@@ -6,7 +6,7 @@ $(PROJECT_NAME).pc:
- 	@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 >> $@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mmm.git/commitdiff/a728b06e93fad4a2f25683dc286f6bb1199fd2cb

More information about the pld-cvs-commit mailing list