Rename to mdxmini-git, install library too

4 files changed, 74 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 294b6f58feec..c55c23ca9cf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = mdxplay-git
-	pkgdesc = Command line music player for Sharp X68000 MDX files
+pkgbase = mdxmini-git
+	pkgdesc = Library and command line player for Sharp X68000 MDX music files
 	pkgver = r19.eda5bca
 	pkgrel = 1
 	url = https://github.com/BouKiCHi/mdxplayer/tree/master/jni/mdxmini
@@ -10,10 +10,10 @@ pkgbase = mdxplay-git
 	depends = sdl
 	provides = mdxplay
 	conflicts = mdxplay
-	source = mdxplay-git::git+https://github.com/BouKiCHi/mdxplayer.git
-	source = makefile.patch
+	source = mdxmini-git::git+https://github.com/BouKiCHi/mdxplayer.git
+	source = makefiles.patch
 	sha256sums = SKIP
-	sha256sums = 65459a3a37cf3fd493da9b79e0848d9fcc6a5d39db383f80a52f510011b56e77
+	sha256sums = 9e402a4a7075065d7f3701acd62883507c7b957793ec3b5cdf5c1190e1a125f4
 
-pkgname = mdxplay-git
+pkgname = mdxmini-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b09b5a25ec0..b79e7d4008ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Matti Niemenmaa <matti.niemenmaa+aur ät iki dȯt fi>
 
-pkgname=mdxplay-git
+pkgname=mdxmini-git
 pkgver=r19.eda5bca
 pkgrel=1
-pkgdesc='Command line music player for Sharp X68000 MDX files'
+pkgdesc='Library and command line player for Sharp X68000 MDX music files'
 arch=(i686 x86_64)
 url='https://github.com/BouKiCHi/mdxplayer/tree/master/jni/mdxmini'
 license=(GPL2)
@@ -12,9 +12,9 @@ makedepends=(git)
 provides=(mdxplay)
 conflicts=(mdxplay)
 source=("$pkgname"::'git+https://github.com/BouKiCHi/mdxplayer.git'
-        makefile.patch)
+        makefiles.patch)
 sha256sums=('SKIP'
-            '65459a3a37cf3fd493da9b79e0848d9fcc6a5d39db383f80a52f510011b56e77')
+            '9e402a4a7075065d7f3701acd62883507c7b957793ec3b5cdf5c1190e1a125f4')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -26,7 +26,7 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$pkgname"
-  patch -p1 -i "$srcdir"/makefile.patch
+  patch -p1 -i "$srcdir"/makefiles.patch
 }
 
 build() {
@@ -35,5 +35,10 @@ build() {
 }
 
 package() {
-  install -Dm755 "$srcdir/$pkgname/jni/mdxmini/mdxplay" "$pkgdir/usr/bin/mdxplay"
+  cd "$srcdir/$pkgname/jni/mdxmini"
+  install -dm755 "$pkgdir/usr/"{bin,include/mdxmini,lib}
+  install -m755 mdxplay "$pkgdir/usr/bin"
+  install -m755 obj/libmdxmini.so "$pkgdir/usr/lib"
+  install -m644 obj/libmdxmini.a "$pkgdir/usr/lib"
+  install -m644 src/{mdxmini,mdx,pcm8}.h "$pkgdir/usr/include/mdxmini"
 }
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index f77c445f671f..000000000000
--- a/makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git i/jni/mdxmini/mak/general.mak w/jni/mdxmini/mak/general.mak
-index e56323b..fff9e7c 100644
---- i/jni/mdxmini/mak/general.mak
-+++ w/jni/mdxmini/mak/general.mak
-@@ -19,8 +19,7 @@ endif
- 
- # iconv
- ifneq ($(OS),Windows_NT)
--CFLAGS += -DUSE_ICONV
--LIBS += -liconv
-+LIBS += -lm
- endif
- 
- #
diff --git a/makefiles.patch b/makefiles.patch
new file mode 100644
index 000000000000..e241efee674d
--- /dev/null
+++ b/makefiles.patch
@@ -0,0 +1,57 @@
+diff --git i/jni/mdxmini/Makefile w/jni/mdxmini/Makefile
+index 9b63041..4cf194d 100644
+--- i/jni/mdxmini/Makefile
++++ w/jni/mdxmini/Makefile
+@@ -75,8 +75,7 @@ $(LIB): $(MKLIB)
+ $(MKLIB):
+ 	make -f Makefile.lib
+ 
+-$(OBJDIR)/nlg.o: src/nlg.c
+-	$(CC) -o $@ $< -c $(CFLAGS)
++$(OBJDIR)/nlg.o: src/nlg.c $(MKLIB)
+ 
+ $(OBJDIR)/sdlplay.o: sdlplay.c
+ 	$(CC) -o $@ $< -c $(CFLAGS)
+diff --git i/jni/mdxmini/mak/general.mak w/jni/mdxmini/mak/general.mak
+index e56323b..fff9e7c 100644
+--- i/jni/mdxmini/mak/general.mak
++++ w/jni/mdxmini/mak/general.mak
+@@ -19,8 +19,7 @@ endif
+ 
+ # iconv
+ ifneq ($(OS),Windows_NT)
+-CFLAGS += -DUSE_ICONV
+-LIBS += -liconv
++LIBS += -lm
+ endif
+ 
+ #
+diff --git i/jni/mdxmini/mak/lib.mak w/jni/mdxmini/mak/lib.mak
+index 38af592..bee1432 100644
+--- i/jni/mdxmini/mak/lib.mak
++++ w/jni/mdxmini/mak/lib.mak
+@@ -3,13 +3,13 @@ LIB = $(OBJDIR)/libmdxmini.a
+ OBJFILES =  mdxmini.o mdx2151.o mdxmml_ym2151.o 
+ OBJFILES += pdxfile.o mdxfile.o pcm8.o ym2151.o nlg.o
+ 
+-CFLAGS += -DUSE_NLG -I.
++CFLAGS += -DUSE_NLG -I. -fPIC
+ 
+ SRCDIR = src
+ 
+ OBJS = $(addprefix $(OBJDIR)/,$(OBJFILES))
+ 
+-all : $(OBJDIR) $(LIB)
++all : $(OBJDIR) $(LIB) $(OBJDIR)/libmdxmini.so
+ 
+ $(OBJDIR) :
+ 	mkdir $(OBJDIR)
+@@ -17,5 +17,8 @@ $(OBJDIR) :
+ $(LIB) : $(OBJS)
+ 	$(AR) rcs $@ $(OBJS)
+ 
++$(OBJDIR)/libmdxmini.so : $(OBJS)
++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LIBS)
++
+ $(OBJDIR)/%.o : $(SRCDIR)/%.c
+ 	$(CC) $(CFLAGS) -o $@ $< -c