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

6 files changed, 26 insertions, 8 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index 0288222c9..d722fde19 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1166,6 +1166,10 @@ $(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\
 	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \
 ,80))
 
+$(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\
+	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \
+,80))
+
 $(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\
 	$(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \
 ,80))
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
index a76e49897..020a53502 100644
--- a/package/SDL_ttf/Makefile
+++ b/package/SDL_ttf/Makefile
@@ -14,14 +14,21 @@ PKG_BUILDDEP:=		sdl freetype
 PKG_URL:=		http://www.libsdl.org/projects/SDL_ttf/
 PKG_SITES:=		http://www.libsdl.org/projects/SDL_ttf/release/
 
-PKG_SUBPKGS:=		LIBSDL_TTF
+PKG_SUBPKGS:=		LIBSDL_TTF LIBSDL_TTF_DEV
+PKGSD_LIBSDL_TTF_DEV:=	development files
+PKGSC_LIBSDL_TTF_DEV:=	devel
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV}))
 
 libsdl-ttf-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
 
+libsdl-ttf-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_TTF_DEV)/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 0b289702f..814d753a2 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
 PKG_VERSION:=		1.11.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_EXTRAVER:=		1.11
 PKG_MD5SUM:=		4ee7f0ff5f0e467d58b6bd5da96b1c74
 PKG_DESCR:=		GNU automake
@@ -26,9 +26,9 @@ automake-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
 	${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \
-		${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
+		${IDIR_AUTOMAKE}/usr/share
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
-	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER}/Automake \
-		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
+	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \
+		${IDIR_AUTOMAKE}/usr/share
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index db3e3cd7e..44ca7a03d 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -14,13 +14,14 @@ PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
 PKG_NEED_CXX:=		1
 
 PKG_SUBPKGS:=		GDK_PIXBUF GDK_PIXBUF_DEV
+PKGSC_GDK_PIXBUF_DEV:=	devel
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GDK_PIXBUF_DEV}))
 
 CONFIGURE_ENV+=		gio_can_sniff=no
 
diff --git a/package/perl/Makefile b/package/perl/Makefile
index bb8565825..7fb8172e1 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		perl
 PKG_VERSION:=		5.12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		29975a69dce54e47fcd6331c085c6c99
 PKG_DESCR:=		full-blown Perl
 PKG_SECTION:=		lang
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=          manual
 
 pre-configure:
-	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
+	(cd ${WRKBUILD}; ./Configure -des -Dusethreads -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PERL}/usr/bin
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index e8986ad86..92d1997c4 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -169,6 +169,12 @@ config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207
 	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
 	help
 
+config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311
+	prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver"
+	tristate
+	depends on ADK_KPACKAGE_KMOD_USB_GSPCA
+	help
+
 config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561
 	prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver"
 	tristate