Gentoo Archives: gentoo-commits

From: "Steve Dibb (beandog)" <beandog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/lsdvd/files: lsdvd-0.16-chapter-count.patch lsdvd-0.16-newline.patch
Date: Tue, 26 Aug 2014 16:14:58
Message-Id: 20140826161453.D33A53EDB@oystercatcher.gentoo.org
1 beandog 14/08/26 16:14:53
2
3 Added: lsdvd-0.16-chapter-count.patch
4 lsdvd-0.16-newline.patch
5 Log:
6 Add patches for removing extra newlines, and fixing chapter count display
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.1 media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lsdvd/files/lsdvd-0.16-chapter-count.patch?rev=1.1&content-type=text/plain
15
16 Index: lsdvd-0.16-chapter-count.patch
17 ===================================================================
18 Using tt_srpt->title[].nr_of_ptts from the VMG IFO as a reference to the
19 chapter count is often wrong, and noted as such in the source code. Use
20 the program chain instead.
21
22 --- lsdvd-0.16/lsdvd.c.orig 2014-08-22 21:47:06.009490680 -0600
23 +++ lsdvd-0.16/lsdvd.c 2014-08-22 21:47:30.947257942 -0600
24 @@ -347,6 +347,7 @@
25 }
26
27 dvd_info.titles[j].chapter_count_reported = ifo_zero->tt_srpt->title[j].nr_of_ptts;
28 + dvd_info.titles[j].chapter_count = pgc->nr_of_programs;
29 dvd_info.titles[j].cell_count = pgc->nr_of_cells;
30 dvd_info.titles[j].audiostream_count = vtsi_mat->nr_of_vts_audio_streams;
31 dvd_info.titles[j].subtitle_count = vtsi_mat->nr_of_vts_subp_streams;
32 --- lsdvd-0.16/ohuman.c.orig 2014-08-22 21:47:00.993538145 -0600
33 +++ lsdvd-0.16/ohuman.c 2014-08-22 21:47:45.533121749 -0600
34 @@ -20,7 +20,7 @@
35 // (int)(dvd_info->titles[j].general.length / 60) % 60,
36 // (float)((int)(dvd_info->titles[j].general.length * 1000) % 6000) / 1000); //,
37 // dvd_info->titles[j].general.length);
38 - printf("Chapters: %02d, Cells: %02d, ", dvd_info->titles[j].chapter_count_reported, dvd_info->titles[j].cell_count);
39 + printf("Chapters: %02d, Cells: %02d, ", dvd_info->titles[j].chapter_count, dvd_info->titles[j].cell_count);
40 printf("Audio streams: %02d, Subpictures: %02d", dvd_info->titles[j].audiostream_count, dvd_info->titles[j].subtitle_count);
41 printf("\n");
42
43
44
45
46 1.1 media-video/lsdvd/files/lsdvd-0.16-newline.patch
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lsdvd/files/lsdvd-0.16-newline.patch?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/lsdvd/files/lsdvd-0.16-newline.patch?rev=1.1&content-type=text/plain
50
51 Index: lsdvd-0.16-newline.patch
52 ===================================================================
53 Removes extra newline from output like this:
54
55 Title: 01, Length: 02:18:41.834 Chapters: 06, Cells: 06, Audio streams: 01, Subpictures: 03
56
57 Title: 02, Length: 00:46:16.000 Chapters: 03, Cells: 03, Audio streams: 01, Subpictures: 03
58
59 Title: 03, Length: 00:46:11.834 Chapters: 03, Cells: 03, Audio streams: 01, Subpictures: 03
60 --- lsdvd-0.16/ohuman.c.orig 2014-08-22 21:47:00.993538145 -0600
61 +++ lsdvd-0.16/ohuman.c 2014-08-22 21:52:11.964633226 -0600
62 @@ -111,11 +111,10 @@
63 printf("\n");
64 }
65 }
66 - printf("\n");
67 }
68 }
69
70 if (! opt_t) {
71 - printf("Longest track: %02d\n\n", dvd_info->longest_track);
72 + printf("Longest track: %02d\n", dvd_info->longest_track);
73 }
74 }