libavc1394-0.5.3-librom.patch 3.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889
  1. Index: libavc1394-0.5.4/Makefile.am
  2. ===================================================================
  3. --- libavc1394-0.5.4.orig/Makefile.am
  4. +++ libavc1394-0.5.4/Makefile.am
  5. @@ -1,4 +1,4 @@
  6. -SUBDIRS = common libavc1394 librom1394 test
  7. +SUBDIRS = common librom1394 libavc1394 test
  8. MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
  9. stamp-h.in
  10. EXTRA_DIST = libavc1394.pc libavc1394.spec
  11. Index: libavc1394-0.5.4/Makefile.in
  12. ===================================================================
  13. --- libavc1394-0.5.4.orig/Makefile.in
  14. +++ libavc1394-0.5.4/Makefile.in
  15. @@ -245,7 +245,7 @@ target_alias = @target_alias@
  16. top_build_prefix = @top_build_prefix@
  17. top_builddir = @top_builddir@
  18. top_srcdir = @top_srcdir@
  19. -SUBDIRS = common libavc1394 librom1394 test
  20. +SUBDIRS = common librom1394 libavc1394 test
  21. MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
  22. stamp-h.in
  23. Index: libavc1394-0.5.4/libavc1394/Makefile.am
  24. ===================================================================
  25. --- libavc1394-0.5.4.orig/libavc1394/Makefile.am
  26. +++ libavc1394-0.5.4/libavc1394/Makefile.am
  27. @@ -1,11 +1,11 @@
  28. MAINTAINERCLEANFILES = Makefile.in
  29. lib_LTLIBRARIES = libavc1394.la
  30. libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
  31. - -version-info @lt_major@:@lt_revision@:@lt_age@
  32. -libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
  33. + -version-info @lt_major@:@lt_revision@:@lt_age@
  34. +#libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
  35. libavc1394_la_SOURCES = \
  36. avc1394_simple.c avc1394_vcr.c \
  37. - avc1394_internal.c avc1394_internal.h
  38. + avc1394_internal.c avc1394_internal.h
  39. pkginclude_HEADERS = avc1394.h avc1394_vcr.h
  40. INCLUDES = @LIBRAW1394_CFLAGS@
  41. Index: libavc1394-0.5.4/libavc1394/Makefile.in
  42. ===================================================================
  43. --- libavc1394-0.5.4.orig/libavc1394/Makefile.in
  44. +++ libavc1394-0.5.4/libavc1394/Makefile.in
  45. @@ -216,12 +216,12 @@ top_srcdir = @top_srcdir@
  46. MAINTAINERCLEANFILES = Makefile.in
  47. lib_LTLIBRARIES = libavc1394.la
  48. libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
  49. - -version-info @lt_major@:@lt_revision@:@lt_age@
  50. + -version-info @lt_major@:@lt_revision@:@lt_age@
  51. -libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
  52. +libavc1394_la_LIBADD = $(top_builddir)/librom1394/librom1394.la
  53. libavc1394_la_SOURCES = \
  54. avc1394_simple.c avc1394_vcr.c \
  55. - avc1394_internal.c avc1394_internal.h
  56. + avc1394_internal.c avc1394_internal.h
  57. pkginclude_HEADERS = avc1394.h avc1394_vcr.h
  58. INCLUDES = @LIBRAW1394_CFLAGS@
  59. Index: libavc1394-0.5.4/librom1394/Makefile.am
  60. ===================================================================
  61. --- libavc1394-0.5.4.orig/librom1394/Makefile.am
  62. +++ libavc1394-0.5.4/librom1394/Makefile.am
  63. @@ -1,7 +1,7 @@
  64. MAINTAINERCLEANFILES = Makefile.in
  65. lib_LTLIBRARIES = librom1394.la
  66. librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
  67. - -version-info @lt_major@:@lt_revision@:@lt_age@ -lm
  68. + -version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
  69. librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
  70. librom1394_la_SOURCES = \
  71. rom1394_main.c \
  72. Index: libavc1394-0.5.4/librom1394/Makefile.in
  73. ===================================================================
  74. --- libavc1394-0.5.4.orig/librom1394/Makefile.in
  75. +++ libavc1394-0.5.4/librom1394/Makefile.in
  76. @@ -215,7 +215,7 @@ top_srcdir = @top_srcdir@
  77. MAINTAINERCLEANFILES = Makefile.in
  78. lib_LTLIBRARIES = librom1394.la
  79. librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \
  80. - -version-info @lt_major@:@lt_revision@:@lt_age@ -lm
  81. + -version-info @lt_major@:@lt_revision@:@lt_age@ -lm -lraw1394
  82. librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo
  83. librom1394_la_SOURCES = \