SOURCES: mythtv-dvdnav-shared.patch - fixed new shared lib deps

czarny czarny at pld-linux.org
Fri Oct 6 10:28:40 CEST 2006


Author: czarny                       Date: Fri Oct  6 08:28:39 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed new shared lib deps

---- Files affected:
SOURCES:
   mythtv-dvdnav-shared.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mythtv-dvdnav-shared.patch
diff -u SOURCES/mythtv-dvdnav-shared.patch:1.1 SOURCES/mythtv-dvdnav-shared.patch:1.2
--- SOURCES/mythtv-dvdnav-shared.patch:1.1	Sun Oct  1 15:25:30 2006
+++ SOURCES/mythtv-dvdnav-shared.patch	Fri Oct  6 10:28:34 2006
@@ -1,11 +1,64 @@
---- mythtv-0.20/libs/libmythdvdnav/libmythdvdnav.pro~	2006-02-17 12:27:03.000000000 +0200
-+++ mythtv-0.20/libs/libmythdvdnav/libmythdvdnav.pro	2006-09-22 00:10:45.000000000 +0300
+diff -urN mythtv-0.20/libs/libmythdvdnav/libmythdvdnav.pro mythtv-0.20.new/libs/libmythdvdnav/libmythdvdnav.pro
+--- mythtv-0.20/libs/libmythdvdnav/libmythdvdnav.pro	2006-02-17 11:27:03.000000000 +0100
++++ mythtv-0.20.new/libs/libmythdvdnav/libmythdvdnav.pro	2006-10-06 09:12:47.000000000 +0200
 @@ -3,7 +3,7 @@
  
  TEMPLATE = lib
  TARGET = mythdvdnav-$$LIBVERSION
 -CONFIG += thread staticlib warn_off
-+CONFIG += thread warn_off
++CONFIG += thread dll warn_off
  target.path = $${LIBDIR}
  
  INCLUDEPATH += ../../
+diff -urN mythtv-0.20/libs/libmythtv/libmythtv.pro mythtv-0.20.new/libs/libmythtv/libmythtv.pro
+--- mythtv-0.20/libs/libmythtv/libmythtv.pro	2006-07-18 14:35:04.000000000 +0200
++++ mythtv-0.20.new/libs/libmythtv/libmythtv.pro	2006-10-06 09:13:19.000000000 +0200
+@@ -45,7 +45,7 @@
+ TARGETDEPS += ../libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../libavformat/libmythavformat-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
+-TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
++TARGETDEPS += ../libmythdvdnav/libmythdvdnav-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ 
+ 
+ DEFINES += _LARGEFILE_SOURCE
+diff -urN mythtv-0.20/programs/programs-libs.pro mythtv-0.20.new/programs/programs-libs.pro
+--- mythtv-0.20/programs/programs-libs.pro	2006-07-09 01:44:07.000000000 +0200
++++ mythtv-0.20.new/programs/programs-libs.pro	2006-10-06 10:03:45.000000000 +0200
+@@ -1,16 +1,16 @@
+-INCLUDEPATH += ../.. ../../libs/ ../../libs/libmyth ../../libs/libmythtv
++INCLUDEPATH += ../.. ../../libs/ ../../libs/libmythdvdnav ../../libs/libmyth ../../libs/libmythtv
+ INCLUDEPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libavcodec
+ INCLUDEPATH += ../../libs/libmythupnp ../../libs/libmythui
+ INCLUDEPATH += ../../libs/libmythlivemedia
+ 
+-LIBS += -L../../libs/libmyth -L../../libs/libmythtv
++LIBS += -L../../libs/libmythdvdnav -L../../libs/libmyth -L../../libs/libmythtv
+ LIBS += -L../../libs/libavutil -L../../libs/libavcodec -L../../libs/libavformat
+ LIBS += -L../../libs/libmythfreemheg
+ LIBS += -L../../libs/libmythui
+ LIBS += -L../../libs/libmythupnp
+ LIBS += -L../../libs/libmythlivemedia
+ 
+-LIBS += -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
++LIBS += -lmythdvdnav-$$LIBVERSION -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
+ LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION 
+ LIBS += -lmythfreemheg-$$LIBVERSION
+ LIBS += -lmythupnp-$$LIBVERSION 
+@@ -25,6 +25,7 @@
+ }
+ TARGETDEPS += ../../libs/libmythui/libmythui-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../../libs/libmyth/libmyth-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
++TARGETDEPS += ../../libs/libmythdvdnav/libmythdvdnav-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../../libs/libmythtv/libmythtv-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../../libs/libavutil/libmythavutil-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../../libs/libavcodec/libmythavcodec-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+@@ -32,7 +33,7 @@
+ TARGETDEPS += ../../libs/libmythupnp/libmythupnp-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ TARGETDEPS += ../../libs/libmythlivemedia/libmythlivemedia-$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB}
+ 
+-DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmythtv
++DEPENDPATH += ../.. ../../libs ../../libs/libmyth ../../libs/libmythdvdnav ../../libs/libmythtv
+ DEPENDPATH += ../../libs/libavutil ../../libs/libavformat ../../libs/libsavcodec
+ DEPENDPATH += ../../libs/libmythupnp ../../libs/libmythui
+ DEPENDPATH += ../../libs/libmythlivemedia
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mythtv-dvdnav-shared.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list