[package] update libdvbpsi to 0.1.6, move to libdvbpsi (#5392)

SVN-Revision: 16533

diff --git a/libs/libdvbpsi/Makefile b/libs/libdvbpsi/Makefile
new file mode 100644 (file)
index 0000000..1a552d0
--- /dev/null
+++ b/libs/libdvbpsi/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libdvbpsi5
+PKG_VERSION:=0.1.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/
+PKG_MD5SUM:=bd2d9861be3311e1e03c91cd9345f542
+PKG_FIXUP:=libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+PKG_INSTALL=1
+
+define Package/libdvbpsi
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=MPEG TS and DVB PSI tables decoding and generating
+  URL:=http://www.videolan.org/developers/libdvbpsi.html
+endef
+
+define Package/libdvbpsi/description
+       libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
+       decoding and generating.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include/dvbpsi
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \
+               $(1)/usr/include/dvbpsi/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,a,la} \
+               $(1)/usr/lib/
+endef
+
+define Package/libdvbpsi/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \
+               $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libdvbpsi))

diff --git a/libs/libdvbpsi/patches/001-no_doc_examples.patch b/libs/libdvbpsi/patches/001-no_doc_examples.patch
new file mode 100644 (file)
index 0000000..a32f5da
--- /dev/null
+++ b/libs/libdvbpsi/patches/001-no_doc_examples.patch
@@ -0,0 +1,25 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = src examples misc
+-DIST_SUBDIRS = $(SUBDIRS) doc debian wince
++SUBDIRS = src
++DIST_SUBDIRS = $(SUBDIRS) debian wince
+ 
+ EXTRA_DIST = libdvbpsi.spec bootstrap
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -179,8 +179,8 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = src examples misc
+-DIST_SUBDIRS = $(SUBDIRS) doc debian wince
++SUBDIRS = src
++DIST_SUBDIRS = $(SUBDIRS) debian wince
+ EXTRA_DIST = libdvbpsi.spec bootstrap
+ AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+ all: config.h

diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi4/Makefile
deleted file mode 100644 (file)
index 5c03648..0000000
--- a/libs/libdvbpsi4/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdvbpsi4
-PKG_VERSION:=0.1.5
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://download.videolan.org/pub/libdvbpsi/$(PKG_VERSION)/
-PKG_MD5SUM:=407cd074b7d6eaf31b20b693ed924655
-PKG_FIXUP:=libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_INSTALL=1
-
-define Package/libdvbpsi4
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=MPEG TS and DVB PSI tables decoding and generating
-  URL:=http://www.videolan.org/developers/libdvbpsi.html
-endef
-
-define Package/libdvbpsi4/description
-       libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
-       decoding and generating.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/include/dvbpsi
-       $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)/usr/include/dvbpsi/*.h \
-               $(1)/usr/include/dvbpsi/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.{so*,a,la} \
-               $(1)/usr/lib/
-endef
-
-define Package/libdvbpsi4/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \
-               $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdvbpsi4))

diff --git a/libs/libdvbpsi4/patches/001-no_doc_examples.patch b/libs/libdvbpsi4/patches/001-no_doc_examples.patch
deleted file mode 100644 (file)
index 3811d58..0000000
--- a/libs/libdvbpsi4/patches/001-no_doc_examples.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN libdvbpsi4-0.1.5/Makefile.am libdvbpsi4-0.1.5.new/Makefile.am
---- libdvbpsi4-0.1.5/Makefile.am       2005-03-21 14:24:33.000000000 +0100
-+++ libdvbpsi4-0.1.5.new/Makefile.am   2008-08-06 12:15:59.000000000 +0200
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = src examples misc
--DIST_SUBDIRS = $(SUBDIRS) doc debian wince
-+SUBDIRS = src
-+DIST_SUBDIRS = $(SUBDIRS) debian wince
- 
- EXTRA_DIST = libdvbpsi.spec bootstrap
- 
-diff -urN libdvbpsi4-0.1.5/Makefile.in libdvbpsi4-0.1.5.new/Makefile.in
---- libdvbpsi4-0.1.5/Makefile.in       2005-07-06 16:44:57.000000000 +0200
-+++ libdvbpsi4-0.1.5.new/Makefile.in   2008-08-06 12:15:47.000000000 +0200
-@@ -136,8 +136,8 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- 
--SUBDIRS = src examples misc
--DIST_SUBDIRS = $(SUBDIRS) doc debian wince
-+SUBDIRS = src
-+DIST_SUBDIRS = $(SUBDIRS) debian wince
- 
- EXTRA_DIST = libdvbpsi.spec bootstrap
-