diff options
Diffstat (limited to 'dev-python/pydvdread/files/pydvdread-1.0-api-update.patch')
| -rw-r--r-- | dev-python/pydvdread/files/pydvdread-1.0-api-update.patch | 287 |
1 files changed, 0 insertions, 287 deletions
diff --git a/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch b/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch deleted file mode 100644 index 71c08158e660..000000000000 --- a/dev-python/pydvdread/files/pydvdread-1.0-api-update.patch +++ /dev/null @@ -1,287 +0,0 @@ -update the module to libdvdread-4.2.0 (at least so tests pass) - ---- a/src/dvdread/__init__.py -+++ b/src/dvdread/__init__.py -@@ -1,6 +1,6 @@ - """Main package of pydvdread.""" - --__all__ = ['cmd_print', -+__all__ = [ - 'dvd_reader', - 'ifo_print', - 'ifo_read', ---- a/src/dvdread/all.i -+++ b/src/dvdread/all.i -@@ -403,7 +403,6 @@ - %{ - #include <stdint.h> - %} --%include "cmd_print.i" - %include "dvd_reader.i" - %include "ifo_print.i" - %include "ifo_read.i" ---- a/src/dvdread/ifo_types.i -+++ b/src/dvdread/ifo_types.i -@@ -374,7 +374,7 @@ typedef struct { - uint16_t nr_of_pre; - uint16_t nr_of_post; - uint16_t nr_of_cell; -- uint16_t last_byte; -+ uint16_t zero_1; - vm_cmd_t *pre_cmds; - vm_cmd_t *post_cmds; - vm_cmd_t *cell_cmds; ---- a/src/dvdread/ifo_print.i -+++ b/src/dvdread/ifo_print.i -@@ -31,6 +31,7 @@ file to stdout." - - %{ - #include <dvdread/ifo_print.h> -+#include <dvdread/ifo_read.h> - %} - - /** -@@ -40,21 +41,6 @@ file to stdout." - %feature("autodoc", "0"); - - /* ifoPrint(dvd, title); */ --void ifoPrint(dvd_reader_t *dvd, int title); -+void ifo_print(dvd_reader_t *dvd, int title); - - %feature("autodoc", "1"); -- --void ifoPrint_VMGI_MAT(vmgi_mat_t *obj); --void ifoPrint_VTSI_MAT(vtsi_mat_t *obj); -- --void ifoPrint_PTL_MAIT(ptl_mait_t *obj); --void ifoPrint_VTS_ATRT(vts_atrt_t *obj); --void ifoPrint_TT_SRPT(tt_srpt_t *obj); --void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *obj); --void ifoPrint_PGC(pgc_t *obj); --void ifoPrint_PGCIT(pgcit_t *obj); --void ifoPrint_PGCI_UT(pgci_ut_t *obj); --void ifoPrint_VTS_TMAPT(vts_tmapt_t *obj); --void ifoPrint_C_ADT(c_adt_t *obj); --void ifoPrint_VOBU_ADMAP(vobu_admap_t *obj); -- ---- a/src/dvdread/ifo_print.py -+++ b/src/dvdread/ifo_print.py -@@ -16,11 +16,4 @@ - ## along with this program; if not, write to the Free Software - ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - --from all import ifoPrint --from all import ifoPrint_VMGI_MAT, ifoPrint_VTSI_MAT --from all import ifoPrint_PTL_MAIT, ifoPrint_VTS_ATRT --from all import ifoPrint_TT_SRPT, ifoPrint_VTS_PTT_SRPT --from all import ifoPrint_PGC, ifoPrint_PGCIT --from all import ifoPrint_PGCI_UT, ifoPrint_VTS_TMAPT --from all import ifoPrint_C_ADT, ifoPrint_VOBU_ADMAP -- -+from all import ifo_print ---- a/src/dvdread/dvd_reader.i -+++ b/src/dvdread/dvd_reader.i -@@ -59,14 +59,6 @@ reading files located on a DVD." - - - /** -- * DVDVersion -- */ --%feature("autodoc", "DVDVersion() -> int\n\n\ --Returns the version of libdvdread.") DVDVersion; --int DVDVersion(void); -- -- --/** - * DVDOpen - */ - %feature("autodoc", "DVDOpen(path) -> dvd\n\n\ -@@ -106,25 +98,6 @@ void DVDClose( dvd_reader_t * ); - - - /** -- * DVDInit -- */ --%feature("autodoc", "DVDInit()\n\n\ --Initializes support for multiple threads.\n\n\ --NOTE: You must call DVDInit before using any of the other functions\n\ --if you are going to use them in a multithreading app.") DVDInit; --void DVDInit(void); -- -- --/** -- * DVDFinish -- */ --%feature("autodoc", "DVDFinish()\n\n\ --Frees any dlopened objects.\n\n\ --NOTE: You must DVDClose all handles opened with DVDOpen before calling this.") DVDFinish; --void DVDFinish(void); -- -- --/** - * File Domains - */ - typedef enum { ---- a/src/dvdread/dvd_reader.py -+++ b/src/dvdread/dvd_reader.py -@@ -22,9 +22,7 @@ from all import DVD_READ_MENU_VOBS, DVD_READ_TITLE_VOBS - - from all import dvd_stat_t - --from all import DVDVersion, DVDOpen --from all import DVDClose, DVDInit --from all import DVDFinish, DVDFileStat -+from all import DVDOpen, DVDClose, DVDFileStat - from all import DVDOpenFile, DVDCloseFile - from all import DVDReadBlocks, DVDFileSeek - from all import DVDReadBytes, DVDFileSize ---- a/tests/TestAll.py -+++ b/tests/TestAll.py -@@ -33,7 +33,6 @@ devpath() - - import unittest - --import Test_cmd_print - import Test_dvd_reader - import Test_ifo_print - import Test_ifo_read -@@ -49,7 +48,6 @@ import TestStruct_nav_types - # Run all tests - if __name__ == '__main__': - if len(sys.argv) > 1: -- Test_cmd_print.DVDPATH = sys.argv[1] - Test_dvd_reader.DVDPATH = sys.argv[1] - Test_ifo_print.DVDPATH = sys.argv[1] - Test_ifo_read.DVDPATH = sys.argv[1] -@@ -57,8 +55,7 @@ if __name__ == '__main__': - Test_nav_print.DVDPATH = sys.argv[1] - Test_nav_read.DVDPATH = sys.argv[1] - Test_nav_types.DVDPATH = sys.argv[1] -- suite = unittest.TestLoader().loadTestsFromModule(Test_cmd_print) -- suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_dvd_reader)) -+ suite = unittest.TestLoader().loadTestsFromModule(Test_dvd_reader) - suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_print)) - suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_read)) - suite.addTest(unittest.TestLoader().loadTestsFromModule(Test_ifo_types)) ---- a/tests/Test_dvd_reader.py -+++ b/tests/Test_dvd_reader.py -@@ -49,9 +49,6 @@ class Test1(unittest.TestCase): - self.assert_(isinstance(dvd_reader.DVD_READ_MENU_VOBS, int)) - self.assert_(isinstance(dvd_reader.DVD_READ_TITLE_VOBS, int)) - -- def test_DVDVersion(self): -- self.assert_(isinstance(dvd_reader.DVDVersion(), int)) -- - class Test2(unittest.TestCase): - - def tearDown(self): -@@ -70,22 +67,6 @@ class Test3(unittest.TestCase): - def test_DVDClose(self): - dvd_reader.DVDClose(self.dvd) - --class Test4(unittest.TestCase): -- -- def tearDown(self): -- dvd_reader.DVDFinish() -- -- def test_DVDInit(self): -- dvd_reader.DVDInit() -- --class Test5(unittest.TestCase): -- -- def setUp(self): -- dvd_reader.DVDInit() -- -- def test_DVDFinish(self): -- dvd_reader.DVDFinish() -- - class Test6(unittest.TestCase): - - def setUp(self): ---- a/tests/Test_ifo_print.py -+++ b/tests/Test_ifo_print.py -@@ -50,45 +50,8 @@ class Test1(unittest.TestCase): - ifo_read.ifoClose(self.ifo) - dvd_reader.DVDClose(self.dvd) - -- def test_ifoPrint(self): -- ifo_print.ifoPrint(self.dvd, 1) -- -- def test_ifoPrint_VMGI_MAT(self): -- ifo_print.ifoPrint_VMGI_MAT(self.ifo0.vmgi_mat) -- -- def test_ifoPrint_VTSI_MAT(self): -- ifo_print.ifoPrint_VTSI_MAT(self.ifo.vtsi_mat) -- -- def test_ifoPrint_PTL_MAIT(self): -- if self.ifo0.ptl_mait: -- ifo_print.ifoPrint_PTL_MAIT(self.ifo0.ptl_mait) -- -- def test_ifoPrint_VTS_ATRT(self): -- ifo_print.ifoPrint_VTS_ATRT(self.ifo0.vts_atrt) -- -- def test_ifoPrint_TT_SRPT(self): -- ifo_print.ifoPrint_TT_SRPT(self.ifo0.tt_srpt) -- -- def test_ifoPrint_VTS_PTT_SRPT(self): -- ifo_print.ifoPrint_VTS_PTT_SRPT(self.ifo.vts_ptt_srpt) -- -- def test_ifoPrint_PGC(self): -- ifo_print.ifoPrint_PGC(self.ifo0.first_play_pgc) -- -- def test_ifoPrint_PGCIT(self): -- ifo_print.ifoPrint_PGCIT(self.ifo.vts_pgcit) -- -- def test_ifoPrint_PGCI_UT(self): -- ifo_print.ifoPrint_PGCI_UT(self.ifo.pgci_ut) -- -- def test_ifoPrint_VTS_TMAPT(self): -- ifo_print.ifoPrint_VTS_TMAPT(self.ifo.vts_tmapt) -- -- def test_ifoPrint_C_ADT(self): -- ifo_print.ifoPrint_C_ADT(self.ifo.menu_c_adt) -- -- def test_ifoPrint_VOBU_ADMAP(self): -- ifo_print.ifoPrint_VOBU_ADMAP(self.ifo.menu_vobu_admap) -+ def test_ifo_print(self): -+ ifo_print.ifo_print(self.dvd, 1) - - - # Run the tests ---- a/tests/Test_ifo_types.py -+++ b/tests/Test_ifo_types.py -@@ -189,7 +189,7 @@ def pgc_command_tbl_t(obj, tester): - tester.assert_(isinstance(obj.nr_of_pre, int)) - tester.assert_(isinstance(obj.nr_of_post, int)) - tester.assert_(isinstance(obj.nr_of_cell, int)) -- tester.assert_(isinstance(obj.last_byte, int)) -+ tester.assert_(isinstance(obj.zero_1, int)) - tester.assert_(callable(obj.pre_cmds)) - for i in range(obj.nr_of_pre): - tester.assert_(isinstance(obj.pre_cmds(i), ifo_types.vm_cmd_t)) -@@ -457,18 +457,18 @@ def ptl_mait_country_t(obj, tester): - tester.assert_(isinstance(obj.zero_1, int)) - tester.assert_(isinstance(obj.pf_ptl_mai_start_byte, int)) - tester.assert_(isinstance(obj.zero_2, int)) -- tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t)) -- pf_level_t(obj.pf_ptl_mai, tester) -+ # No idea what's going on here. -+ #tester.assert_(isinstance(obj.pf_ptl_mai, ifo_types.pf_level_t)) -+ #pf_level_t(obj.pf_ptl_mai, tester) - - def ptl_mait_t(obj, tester): - tester.assert_(isinstance(obj.nr_of_countries, int)) - tester.assert_(isinstance(obj.nr_of_vtss, int)) - tester.assert_(isinstance(obj.last_byte, int)) -- tester.assert_(isinstance(obj.countries, list)) -- tester.assertEqual(len(obj.countries), obj.nr_of_countries) -- for elem in obj.countries: -- tester.assert_(isinstance(elem, ifo_types.ptl_mait_country_t)) -- ptl_mait_country_t(elem, tester) -+ tester.assert_(callable(obj.countries)) -+ for i in range(obj.nr_of_countries): -+ tester.assert_(isinstance(obj.countries(i), ifo_types.ptl_mait_country_t)) -+ ptl_mait_country_t(obj.countries(i), tester) - - def vts_attributes_t(obj, tester): - tester.assert_(isinstance(obj.last_byte, int)) |