move to libs/comp, add new package lz4

package/Config.in

@@ -63,6 +63,7 @@ endmenu
 
 menu "Libraries"
 source package/Config.in.auto.libs.audio
+source package/Config.in.auto.libs.comp
 source package/Config.in.auto.libs.crypto
 source package/Config.in.auto.libs.data
 source package/Config.in.auto.libs.db

package/bzip2/Makefile

@@ -21,7 +21,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		BZIP2 LIBBZ2
 PKGSD_LIBBZ2:=		bzip2 compression library
-PKGSC_LIBBZ2:=		libs/misc
+PKGSC_LIBBZ2:=		libs/comp
 
 include ${ADK_TOPDIR}/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk

package/liblzo/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.08
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		fcec64c26a0f4f4901468f360029678f
 PKG_DESCR:=		real-time data compression library
-PKG_SECTION:=		libs/misc
+PKG_SECTION:=		libs/comp
 PKG_URL:=		http://www.oberhumer.com/opensource/lzo
 PKG_SITES:=		http://www.oberhumer.com/opensource/lzo/download/
 PKG_LIBNAME:=		liblzo

package/lz4/Makefile

@@ -0,0 +1,44 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${ADK_TOPDIR}/rules.mk
+
+PKG_NAME:=		lz4
+PKG_VERSION:=		118
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		7b155d93c6e5d48494f8bfd32f831440
+PKG_DESCR:=		compression utility
+PKG_SECTION:=		app/archive
+PKG_DEPENDS:=		liblz4
+PKG_URL:=		https://code.google.com/p/lz4/
+PKG_SITES:=		https://github.com/Cyan4973/lz4/archive/
+PKG_OPTS:=		dev
+PKG_LIBNAME:=		liblz4
+PKG_OPTS:=		dev
+
+DISTFILES:=		r${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}-r${PKG_VERSION}
+
+PKG_SUBPKGS:=		LZ4 LIBLZ4
+PKGSD_LIBLZ4:=		lz4 compression library
+PKGSC_LIBLZ4:=		libs/comp
+
+include ${ADK_TOPDIR}/mk/host.mk
+include ${ADK_TOPDIR}/mk/package.mk
+
+$(eval $(call HOST_template,LZ4,lz4,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LZ4,lz4,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBLZ4,liblz4,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBLZ4},${PKGSD_LIBLZ4},${PKGSC_LIBLZ4},${PKG_OPTS}))
+
+CONFIG_STYLE:=		manual
+
+lz4-install:
+	${INSTALL_DIR} ${IDIR_LZ4}/usr/bin
+	${CP} ${WRKINST}/usr/bin/* ${IDIR_LZ4}/usr/bin
+
+liblz4-install:
+	${INSTALL_DIR} ${IDIR_LIBLZ4}/usr/lib
+	${CP} ${WRKINST}/usr/lib/liblz4.so* ${IDIR_LIBLZ4}/usr/lib
+
+include ${ADK_TOPDIR}/mk/host-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/lz4/patches/patch-Makefile

@@ -0,0 +1,37 @@
+--- lz4-r118.orig/Makefile	2014-06-26 11:36:13.000000000 +0200
++++ lz4-r118/Makefile	2014-06-30 07:42:30.000000000 +0200
+@@ -39,8 +39,8 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$
+ 
+ DESTDIR=
+ PREFIX = /usr
+-CC    := $(CC)
+-CFLAGS+= -I. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CC    ?= $(CC)
++CFLAGS+= -I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ 
+ LIBDIR?= $(PREFIX)/lib
+ INCLUDEDIR=$(PREFIX)/include
+@@ -55,19 +55,10 @@ else
+ EXT =
+ endif
+ 
+-# OS X linker doesn't support -soname, and use different extension
+-# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
+-ifeq ($(shell uname), Darwin)
+-	SONAME_FLAGS =
+-	SHARED_EXT = dylib
+-	SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
+-	SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
+-else
+-	SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
+-	SHARED_EXT = so
+-	SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
+-	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
+-endif
++SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
++SHARED_EXT = so
++SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
++SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
+ 
+ TEXT = lz4.c lz4.h lz4hc.c lz4hc.h \
+ 	lz4_format_description.txt Makefile NEWS LICENSE README.md \

package/lz4/patches/patch-Makefile.orig

@@ -0,0 +1,26 @@
+--- lz4-r118.orig/Makefile	2014-06-26 11:36:13.000000000 +0200
++++ lz4-r118/Makefile	2014-06-30 07:41:17.000000000 +0200
+@@ -55,19 +55,10 @@ else
+ EXT =
+ endif
+ 
+-# OS X linker doesn't support -soname, and use different extension
+-# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
+-ifeq ($(shell uname), Darwin)
+-	SONAME_FLAGS =
+-	SHARED_EXT = dylib
+-	SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
+-	SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
+-else
+-	SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
+-	SHARED_EXT = so
+-	SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
+-	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
+-endif
++SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
++SHARED_EXT = so
++SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
++SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
+ 
+ TEXT = lz4.c lz4.h lz4hc.c lz4hc.h \
+ 	lz4_format_description.txt Makefile NEWS LICENSE README.md \

package/lz4/patches/patch-programs_Makefile

@@ -0,0 +1,26 @@
+--- lz4-r118.orig/programs/Makefile	2014-06-26 11:36:13.000000000 +0200
++++ lz4-r118/programs/Makefile	2014-06-30 08:09:52.000000000 +0200
+@@ -33,8 +33,8 @@
+ RELEASE=r118
+ DESTDIR=
+ PREFIX=/usr
+-CC:=$(CC)
+-CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CC?=$(CC)
++CFLAGS+= -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+ BINDIR=$(PREFIX)/bin
+@@ -67,10 +67,10 @@ endif
+ 
+ default: lz4 lz4c
+ 
+-all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 datagen
++all: lz4 lz4c
+ 
+ lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
+-	$(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
++	$(CC)      $(FLAGS) $^ -o $@$(EXT)
+ 
+ lz4c  : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
+ 	$(CC)      $(FLAGS) $^ -o $@$(EXT)

package/lz4/patches/patch-programs_Makefile.orig

@@ -0,0 +1,22 @@
+--- lz4-r118.orig/programs/Makefile	2014-06-26 11:36:13.000000000 +0200
++++ lz4-r118/programs/Makefile	2014-06-30 07:44:45.000000000 +0200
+@@ -33,8 +33,8 @@
+ RELEASE=r118
+ DESTDIR=
+ PREFIX=/usr
+-CC:=$(CC)
+-CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
++CC?=$(CC)
++CFLAGS+= -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
+ FLAGS= -I.. $(CFLAGS)
+ 
+ BINDIR=$(PREFIX)/bin
+@@ -67,7 +67,7 @@ endif
+ 
+ default: lz4 lz4c
+ 
+-all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 datagen
++all: lz4 lz4c
+ 
+ lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c
+ 	$(CC)      $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)

package/section.lst

@@ -44,6 +44,7 @@ x11/misc	Xorg misc
 x11/fonts	Xorg fonts
 x11/libs	Xorg libraries
 libs/audio	Audio Libraries
+libs/comp	Compression Libraries
 libs/crypto	Crypto Libraries
 libs/data	XML and JSON Libraries
 libs/db		Database Libraries

package/xz/Makefile

@@ -5,27 +5,38 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		xz
 PKG_VERSION:=		5.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		19d924e066b6fff0bc9d1981b4e53196
 PKG_DESCR:=		compression utility
 PKG_SECTION:=		app/archive
+PKG_DEPENDS:=		libxz
 PKG_URL:=		http://tukaani.org/xz/
 PKG_SITES:=		http://tukaani.org/xz/
 PKG_OPTS:=		dev
+PKG_LIBNAME:=		libxz
+PKG_OPTS:=		dev
 PKG_BB:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+PKG_SUBPKGS:=		XZ LIBXZ
+PKGSD_LIBXZ:=		xz compression library
+PKGSC_LIBXZ:=		libs/comp
+
 include ${ADK_TOPDIR}/mk/host.mk
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXZ,libxz,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXZ},${PKGSD_LIBXZ},${PKGSC_LIBXZ},${PKG_OPTS}))
 
 xz-install:
-	${INSTALL_DIR} ${IDIR_XZ}/usr/bin ${IDIR_XZ}/usr/lib
+	${INSTALL_DIR} ${IDIR_XZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin
-	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_XZ}/usr/lib
+
+libxz-install:
+	${INSTALL_DIR} ${IDIR_LIBXZ}/usr/lib
+	${CP} ${WRKINST}/usr/lib/liblzma.so* ${IDIR_LIBXZ}/usr/lib
 
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/zlib/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.2.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		2ab442d169156f34c379c968f3f482dd
 PKG_DESCR:=		implementation of the deflate compression method
-PKG_SECTION:=		libs/misc
+PKG_SECTION:=		libs/comp
 PKG_URL:=		http://www.zlib.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/zlib/}
 PKG_OPTS:=		dev