Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 185 insertions, 1 deletions

diff --git a/package/json-c/Makefile b/package/json-c/Makefile
new file mode 100644
index 000000000..de4f0e04e
--- /dev/null
+++ b/package/json-c/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		json-c
+PKG_VERSION:=		0.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		aa02367d2f7a830bf1e3376f77881e98
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/json-c/json-c/wiki
+PKG_SITES:=		https://s3.amazonaws.com/json-c_releases/releases/
+PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-c-install:
+	$(INSTALL_DIR) $(IDIR_JSON_C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_JSON_C)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libjson/Makefile b/package/libjson/Makefile
new file mode 100644
index 000000000..6520bd419
--- /dev/null
+++ b/package/libjson/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libjson
+PKG_VERSION:=		7.6.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		82f3fcbf9f8cf3c4e25e1bdd77d65164
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		http://sourceforge.net/projects/libjson/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjson/}
+PKG_OPTS:=		dev
+
+PKG_NOPARALLEL:=	1
+
+DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.zip
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBJSON,libjson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:=		makefile
+FAKE_FLAGS+=		prefix=${WRKINST}/usr
+CONFIG_STYLE:=		manual
+
+libjson-install:
+	$(INSTALL_DIR) $(IDIR_LIBJSON)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_LIBJSON)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libjson/patches/patch-makefile b/package/libjson/patches/patch-makefile
new file mode 100644
index 000000000..919c6308c
--- /dev/null
+++ b/package/libjson/patches/patch-makefile
@@ -0,0 +1,50 @@
+--- libjson.orig/makefile	2014-01-17 20:38:29.584543459 +0100
++++ libjson/makefile	2014-01-17 20:38:14.372460375 +0100
+@@ -128,7 +128,7 @@ objects        = internalJSONNode.o JSON
+                  JSONDebug.o JSONIterators.o JSONMemory.o JSONNode.o \
+                  JSONNode_Mutex.o JSONPreparse.o JSONStream.o JSONValidator.o \
+                  JSONWorker.o JSONWriter.o libjson.o 
+-OS=$(shell uname)
++OS=Linux
+ 
+ # Defaults
+ ifeq ($(OS), Darwin)
+@@ -158,8 +158,7 @@ srcdir          ?= _internal/Source
+ CXX             ?= c++
+ AR              ?= ar
+ PIC             ?= PIC
+-BUILD_TYPE      ?= "default"
+-SHARED          ?= "1"
++SHARED          ?= 1
+ 
+ 
+ # Internal Variables
+@@ -237,18 +236,16 @@ endif
+ 
+ # Compile object files
+ $(objdir)/%.o: $(srcdir)/%.cpp
+-	$(CXX) $< -o $@ -c $(CXXFLAGS)
++	$(CXX) $< -o $@ -c $(CPPFLAGS) $(CXXFLAGS)
+ 
+ ifeq ($(SHARED),1)
+ install: banner install_headers $(lib_target)
+ 	@echo "Install shared library"
++	mkdir -p $(inst_path)
+ 	cp -f ./$(lib_target) $(inst_path)
+ 	cd $(inst_path) ; \
+ 	ln -sf $(lib_target) $(libname_shared_major_version) ; \
+ 	ln -sf $(libname_shared_major_version) $(libname_shared)
+-ifneq ($(OS),Darwin)
+-	ldconfig
+-endif
+ 	@echo "Install shared library: Done."
+ else
+ install: banner install_headers $(lib_target)
+@@ -266,7 +263,6 @@ install_headers: banner
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
+ 	@echo "Install header files: Done."
+ 
+ clean: banner
diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile
new file mode 100644
index 000000000..b1663a23c
--- /dev/null
+++ b/package/libsndfile/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libsndfile
+PKG_VERSION:=		1.0.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e2b7bb637e01022c7d20f95f9c3990a2
+PKG_DESCR:=		reading and writing files containing sampled sound
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.mega-nerd.com/libsndfile/
+PKG_SITES:=		http://www.mega-nerd.com/libsndfile/files/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSNDFILE,libsndfile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libsndfile-install:
+	$(INSTALL_DIR) $(IDIR_LIBSNDFILE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsndfile*.so* \
+		$(IDIR_LIBSNDFILE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index adfd6f4cc..4d4c8c4c8 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		d2f3b7d4627e69e13514a40e72a24d50
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		libtool-host
+PKG_BUILDDEP:=		m4-host libtool-host
 PKG_URL:=		http://www.gnu.org/software/libtool/
 PKG_SITES:=		${MASTER_SITE_GNU:=libtool/}
 PKG_LIBNAME:=		libltdl
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
new file mode 100644
index 000000000..25e353bcd
--- /dev/null
+++ b/package/pulseaudio/Makefile
@@ -0,0 +1,49 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		pulseaudio
+PKG_VERSION:=		4.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		591f211db2790a7e4d222f2dc6858db3
+PKG_DESCR:=		a sound system for POSIX OSes
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		libltdl json-c libsndfile libudev libspeex
+PKG_DEPENDS+=		libflac libvorbis libogg libuuid libsndfile
+PKG_BUILDDEP:=		libtool json-c libsndfile eudev speex libsndfile
+PKG_BUILDDEP+=		flac libvorbis libogg util-linux
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
+PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+=	--disable-systemd \
+			--disable-manpages \
+			--disable-neon-opt \
+			--disable-x11 \
+			--disable-openssl \
+			--enable-dbus \
+			--enable-udev \
+			--enable-speex \
+
+pulseaudio-install:
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse
+	$(CP) $(WRKINST)/etc/pulse/* \
+		$(IDIR_PULSEAUDIO)/etc/pulse
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpulse*.so* \
+		$(IDIR_PULSEAUDIO)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+	$(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \
+		$(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+
+include ${TOPDIR}/mk/pkg-bottom.mk