blob: 5f20b85a641f70d2d24b7c703d23613f87cc9a09 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am.ftbfs 2013-07-21 09:56:44.000000000 +0200
+++ trinity-k9copy-14.0.0~pre130+76443cbb/src/Makefile.am 2013-08-02 11:00:55.291717387 +0200
@@ -35,7 +35,7 @@
$(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \
$(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \
$(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \
- $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread
+ $(LIB_TDEUI) -ltdemdi $(LIBDL) -ldvdread -lk3b -lk3bdevice
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
--- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200
+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200
@@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef __MPEG2_INTERNAL_H__
+#define __MPEG2_INTERNAL_H__
+
/* macroblock modes */
#define MACROBLOCK_INTRA 1
#define MACROBLOCK_PATTERN 2
@@ -298,3 +301,5 @@
extern mpeg2_mc_t mpeg2_mc_altivec;
extern mpeg2_mc_t mpeg2_mc_alpha;
extern mpeg2_mc_t mpeg2_mc_vis;
+
+#endif // __MPEG2_INTERNAL_H__
|