From 71dfc3d66855b2ae97bddd5b36d0f2c511dbeeb4 Mon Sep 17 00:00:00 2001
From: Matthias Fischer <fischerm@ipfire.org>
Date: Sun, 7 Dec 2014 15:46:39 +0100
Subject: [PATCH] libdvbpsi: Update to 1.2.0

---
 config/rootfiles/packages/libdvbpsi | 43 +++++++++++++++++++++++++++--
 lfs/libdvbpsi                       | 10 +++----
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/packages/libdvbpsi b/config/rootfiles/packages/libdvbpsi
index 911b5fdef2..b7b07730ef 100644
--- a/config/rootfiles/packages/libdvbpsi
+++ b/config/rootfiles/packages/libdvbpsi
@@ -1,4 +1,10 @@
 #usr/include/dvbpsi
+#usr/include/dvbpsi/atsc_eit.h
+#usr/include/dvbpsi/atsc_ett.h
+#usr/include/dvbpsi/atsc_mgt.h
+#usr/include/dvbpsi/atsc_stt.h
+#usr/include/dvbpsi/atsc_vct.h
+#usr/include/dvbpsi/bat.h
 #usr/include/dvbpsi/cat.h
 #usr/include/dvbpsi/demux.h
 #usr/include/dvbpsi/descriptor.h
@@ -17,24 +23,57 @@
 #usr/include/dvbpsi/dr_0d.h
 #usr/include/dvbpsi/dr_0e.h
 #usr/include/dvbpsi/dr_0f.h
+#usr/include/dvbpsi/dr_13.h
+#usr/include/dvbpsi/dr_14.h
+#usr/include/dvbpsi/dr_40.h
+#usr/include/dvbpsi/dr_41.h
 #usr/include/dvbpsi/dr_42.h
+#usr/include/dvbpsi/dr_43.h
+#usr/include/dvbpsi/dr_44.h
+#usr/include/dvbpsi/dr_45.h
 #usr/include/dvbpsi/dr_47.h
 #usr/include/dvbpsi/dr_48.h
+#usr/include/dvbpsi/dr_49.h
+#usr/include/dvbpsi/dr_4a.h
+#usr/include/dvbpsi/dr_4b.h
+#usr/include/dvbpsi/dr_4c.h
 #usr/include/dvbpsi/dr_4d.h
 #usr/include/dvbpsi/dr_4e.h
+#usr/include/dvbpsi/dr_4f.h
+#usr/include/dvbpsi/dr_50.h
 #usr/include/dvbpsi/dr_52.h
+#usr/include/dvbpsi/dr_53.h
+#usr/include/dvbpsi/dr_54.h
 #usr/include/dvbpsi/dr_55.h
 #usr/include/dvbpsi/dr_56.h
+#usr/include/dvbpsi/dr_58.h
 #usr/include/dvbpsi/dr_59.h
+#usr/include/dvbpsi/dr_5a.h
+#usr/include/dvbpsi/dr_62.h
+#usr/include/dvbpsi/dr_66.h
 #usr/include/dvbpsi/dr_69.h
+#usr/include/dvbpsi/dr_73.h
+#usr/include/dvbpsi/dr_76.h
+#usr/include/dvbpsi/dr_7c.h
+#usr/include/dvbpsi/dr_81.h
+#usr/include/dvbpsi/dr_83.h
+#usr/include/dvbpsi/dr_86.h
+#usr/include/dvbpsi/dr_8a.h
+#usr/include/dvbpsi/dr_a0.h
+#usr/include/dvbpsi/dr_a1.h
 #usr/include/dvbpsi/dvbpsi.h
 #usr/include/dvbpsi/eit.h
+#usr/include/dvbpsi/nit.h
 #usr/include/dvbpsi/pat.h
 #usr/include/dvbpsi/pmt.h
 #usr/include/dvbpsi/psi.h
+#usr/include/dvbpsi/rst.h
 #usr/include/dvbpsi/sdt.h
+#usr/include/dvbpsi/sis.h
+#usr/include/dvbpsi/tot.h
 #usr/lib/libdvbpsi.a
 #usr/lib/libdvbpsi.la
 usr/lib/libdvbpsi.so
-usr/lib/libdvbpsi.so.5
-usr/lib/libdvbpsi.so.5.0.0
+usr/lib/libdvbpsi.so.9
+usr/lib/libdvbpsi.so.9.0.0
+#usr/lib/pkgconfig/libdvbpsi.pc
diff --git a/lfs/libdvbpsi b/lfs/libdvbpsi
index cc7f0e34d8..68c7deb393 100644
--- a/lfs/libdvbpsi
+++ b/lfs/libdvbpsi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2014  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.1.6
+VER        = 1.2.0
 
-THISAPP    = libdvbpsi5-$(VER)
+THISAPP    = libdvbpsi-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libdvbpsi
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bd2d9861be3311e1e03c91cd9345f542
+$(DL_FILE)_MD5 = 69e38e93c4db4f2a58cbd0b6f9f38228
 
 install : $(TARGET)
 
-- 
2.39.5