From 32bfa75baeaa46d8f176204f4687e0034ab51f0e Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 21 Jun 2009 14:31:10 +0000
Subject: [PATCH] [package] update libdvbpsi to 0.1.6, move to libdvbpsi
 (#5392)

SVN-Revision: 16533
---
 libs/{libdvbpsi4 => libdvbpsi}/Makefile        | 16 ++++++++--------
 .../patches/001-no_doc_examples.patch          | 18 ++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)
 rename libs/{libdvbpsi4 => libdvbpsi}/Makefile (81%)
 rename libs/{libdvbpsi4 => libdvbpsi}/patches/001-no_doc_examples.patch (51%)

diff --git a/libs/libdvbpsi4/Makefile b/libs/libdvbpsi/Makefile
similarity index 81%
rename from libs/libdvbpsi4/Makefile
rename to libs/libdvbpsi/Makefile
index 5c03648727..1a552d0578 100644
--- a/libs/libdvbpsi4/Makefile
+++ b/libs/libdvbpsi/Makefile
@@ -7,27 +7,27 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libdvbpsi4
-PKG_VERSION:=0.1.5
-PKG_RELEASE:=2
+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:=407cd074b7d6eaf31b20b693ed924655
+PKG_MD5SUM:=bd2d9861be3311e1e03c91cd9345f542
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 PKG_INSTALL=1
 
-define Package/libdvbpsi4
+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/libdvbpsi4/description
+define Package/libdvbpsi/description
 	libdvbpsi is a simple library designed for MPEG TS and DVB PSI tables
 	decoding and generating.
 endef
@@ -45,11 +45,11 @@ define Build/InstallDev
 		$(1)/usr/lib/
 endef
 
-define Package/libdvbpsi4/install
+define Package/libdvbpsi/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/libdvbpsi.so* \
 		$(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,libdvbpsi4))
+$(eval $(call BuildPackage,libdvbpsi))
diff --git a/libs/libdvbpsi4/patches/001-no_doc_examples.patch b/libs/libdvbpsi/patches/001-no_doc_examples.patch
similarity index 51%
rename from libs/libdvbpsi4/patches/001-no_doc_examples.patch
rename to libs/libdvbpsi/patches/001-no_doc_examples.patch
index 3811d58cd1..a32f5da700 100644
--- a/libs/libdvbpsi4/patches/001-no_doc_examples.patch
+++ b/libs/libdvbpsi/patches/001-no_doc_examples.patch
@@ -1,6 +1,5 @@
-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
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -11,17 +10,16 @@ diff -urN libdvbpsi4-0.1.5/Makefile.am libdvbpsi4-0.1.5.new/Makefile.am
  
  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 @@
+--- 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
-- 
2.30.2