system-zeromq.patch

   1 --- mythtv-0.26.0/settings.pro~ 2012-10-02 12:30:24.000000000 +0200
   2 +++ mythtv-0.26.0/settings.pro  2013-05-17 14:39:54.880716558 +0200
   3 @@ -159,7 +159,7 @@
   4  EXTRA_LIBS += $$LOCAL_LIBDIR_OGL
   5  EXTRA_LIBS += $$LOCAL_LIBDIR_X11
   6  EXTRA_LIBS += $$CONFIG_OPENGL_LIBS
   7 -EXTRA_LIBS += -L$$SRC_PATH_BARE/external/zeromq/src/.libs -lmythzmq
   8 +EXTRA_LIBS += -L$$SRC_PATH_BARE/external/zeromq/src/.libs -lzmq
   9  EXTRA_LIBS += -L$$SRC_PATH_BARE/external/nzmqt/src -lmythnzmqt
  10  EXTRA_LIBS += -L$$SRC_PATH_BARE/external/qjson/lib -lmythqjson
  11
  12 --- mythtv-0.26.0/external/Makefile~    2012-10-02 12:30:24.000000000 +0200
  13 +++ mythtv-0.26.0/external/Makefile     2013-05-17 14:41:24.148265283 +0200
  14 @@ -1,6 +1,6 @@
  15  include ../config.mak
  16
  17 -SUBDIRS = FFmpeg zeromq nzmqt qjson
  18 +SUBDIRS = FFmpeg nzmqt qjson
  19
  20  SUBDIRS_ALL = $(addsuffix -all, ${SUBDIRS})
  21  SUBDIRS_INSTALL = $(addsuffix -install, ${SUBDIRS})
  22 @@ -19,18 +19,7 @@
  23  FFmpeg-all FFmpeg-install FFmpeg-uninstall FFmpeg-clean FFmpeg-distclean:
  24         ${MAKE} -C FFmpeg ${@:FFmpeg-%=%}
  25
  26 -zeromq-all:    zeromq/Makefile
  27 -       ${MAKE} -C zeromq all
  28 -
  29 -zeromq/Makefile:       zeromq/configure
  30 -       (cd zeromq ; \
  31 -        ./configure --without-documentation --prefix=${PREFIX} \
  32 -                    --includedir=${PREFIX}/include/mythtv/zeromq)
  33 -
  34 -zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
  35 -       ${MAKE} -C zeromq ${@:zeromq-%=%} DESTDIR=${INSTALL_ROOT}
  36 -
  37 -nzmqt-all:     zeromq-all
  38 +nzmqt-all:
  39         (cd nzmqt/src ; ${QMAKE} -o Makefile)
  40         ${MAKE} -C nzmqt/src all
  41
  42 --- mythtv-0.26.0/external/nzmqt/src/nzmqt.pro~ 2012-10-02 12:30:24.000000000 +0200
  43 +++ mythtv-0.26.0/external/nzmqt/src/nzmqt.pro  2013-05-17 14:42:17.035454300 +0200
  44 @@ -30,7 +30,7 @@
  45      NzmqtApp.h \
  46      common/Tools.h
  47
  48 -LIBS += -lmythzmq
  49 +LIBS += -lzmq
  50  LIBS += $${LATE_LIBS}
  51
  52  INCLUDEPATH += \