summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-02-11 22:01:19 +0000
committerDavid Schleef <ds@schleef.org>2005-02-11 22:01:19 +0000
commite6ed8165daebce4cb3aa37ef2b8919a38c318194 (patch)
tree2299b9da19e08113d5c281f719877b822fb746bd
parent6fb89a4678de8aa0b9e377e37ef6cee55b8012d2 (diff)
downloadgstreamer-plugins-base-e6ed8165daebce4cb3aa37ef2b8919a38c318194.tar.gz
configure.ac: Pull in librfb from my CVS tree, because it is too small and annoying to be separate. Move rfbsrc plug...
Original commit message from CVS: * configure.ac: Pull in librfb from my CVS tree, because it is too small and annoying to be separate. Move rfbsrc plugin to gst/. * ext/Makefile.am: * ext/librfb/Makefile.am: * ext/librfb/gstrfbsrc.c: * gst/librfb/Makefile.am: * gst/librfb/gstrfbsrc.c: * gst/librfb/rfb.c: * gst/librfb/rfb.h: * gst/librfb/rfbbuffer.c: * gst/librfb/rfbbuffer.h: * gst/librfb/rfbbytestream.c: * gst/librfb/rfbbytestream.h: * gst/librfb/rfbcontext.h: * gst/librfb/rfbdecoder.c: * gst/librfb/rfbdecoder.h: * gst/librfb/rfbutil.h:
-rw-r--r--ChangeLog21
-rw-r--r--configure.ac3
-rw-r--r--ext/Makefile.am8
3 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c80139494..54db7f60b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2005-02-11 David Schleef <ds@schleef.org>
+
+ * configure.ac: Pull in librfb from my CVS tree, because it is
+ too small and annoying to be separate. Move rfbsrc plugin
+ to gst/.
+ * ext/Makefile.am:
+ * ext/librfb/Makefile.am:
+ * ext/librfb/gstrfbsrc.c:
+ * gst/librfb/Makefile.am:
+ * gst/librfb/gstrfbsrc.c:
+ * gst/librfb/rfb.c:
+ * gst/librfb/rfb.h:
+ * gst/librfb/rfbbuffer.c:
+ * gst/librfb/rfbbuffer.h:
+ * gst/librfb/rfbbytestream.c:
+ * gst/librfb/rfbbytestream.h:
+ * gst/librfb/rfbcontext.h:
+ * gst/librfb/rfbdecoder.c:
+ * gst/librfb/rfbdecoder.h:
+ * gst/librfb/rfbutil.h:
+
2005-02-10 Tim-Philipp Müller <tim at centricular dot net>
* gst/speed/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 870d269a6..5a7d18f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,6 +387,7 @@ GST_PLUGINS_ALL="\
interleave \
law \
level \
+ librfb \
matroska \
median \
mixmatrix \
@@ -1969,6 +1970,7 @@ gst/goom/Makefile
gst/interleave/Makefile
gst/law/Makefile
gst/level/Makefile
+gst/librfb/Makefile
gst/matroska/Makefile
gst/median/Makefile
gst/mixmatrix/Makefile
@@ -2074,7 +2076,6 @@ ext/libcaca/Makefile
ext/libfame/Makefile
ext/libmng/Makefile
ext/libpng/Makefile
-ext/librfb/Makefile
ext/libvisual/Makefile
ext/mad/Makefile
dnl ext/mas/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 689b339b2..19c8c3dcf 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -220,12 +220,6 @@ else
POLYP_DIR=
endif
-if USE_LIBRFB
-LIBRFB_DIR=librfb
-else
-LIBRFB_DIR=
-endif
-
if USE_LIBVISUAL
LIBVISUAL_DIR=libvisual
else
@@ -439,7 +433,6 @@ SUBDIRS=\
$(LIBFAME_DIR) \
$(LIBMNG_DIR) \
$(LIBPNG_DIR) \
- $(LIBRFB_DIR) \
$(LIBVISUAL_DIR) \
$(MAD_DIR) \
$(MIKMOD_DIR) \
@@ -505,7 +498,6 @@ DIST_SUBDIRS=\
libmng \
libmms \
libpng \
- librfb \
libvisual \
mad \
mikmod \