rework configure.ac; make asterisk rtp stuff compile on mingw

Original commit message from CVS:
rework configure.ac; make asterisk rtp stuff compile on mingw

37 files changed, 95 insertions, 50 deletions

diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am
index 95c565a1..fd54707b 100644
--- a/gst/alpha/Makefile.am
+++ b/gst/alpha/Makefile.am
@@ -1,15 +1,13 @@
-
 plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la
 
 libgstalpha_la_SOURCES = gstalpha.c
-libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstalpha_la_LIBADD = $(GST_LIBS)
 libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 libgstalphacolor_la_SOURCES = gstalphacolor.c
-libgstalphacolor_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-			     $(GST_PLUGINS_BASE_CFLAGS)
+libgstalphacolor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstalphacolor_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstalphacolor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = 
diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index 37724f31..566f2b6e 100644
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -892,4 +892,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "alpha",
     "adds an alpha channel to video",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c
index 54456291..9d28bbe3 100644
--- a/gst/alpha/gstalphacolor.c
+++ b/gst/alpha/gstalphacolor.c
@@ -286,4 +286,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "alphacolor",
     "RGB->YUV colorspace conversion preserving the alpha channels",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c
index f2f2f8a6..82abd601 100644
--- a/gst/auparse/gstauparse.c
+++ b/gst/auparse/gstauparse.c
@@ -411,4 +411,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "auparse",
-    "parses au streams", plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    "parses au streams", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c
index 2becffcd..afd7ba9f 100644
--- a/gst/autodetect/gstautoaudiosink.c
+++ b/gst/autodetect/gstautoaudiosink.c
@@ -108,7 +108,7 @@ gst_auto_audio_sink_factory_filter (GstPluginFeature * feature, gpointer data)
 
   /* audio sinks */
   klass = gst_element_factory_get_klass (GST_ELEMENT_FACTORY (feature));
-  if (strcmp (klass, "Sink/Audio") != 0)
+  if (!(strstr (klass, "Sink") && strstr (klass, "Audio")))
     return FALSE;
 
   /* only select elements with autoplugging rank */
@@ -137,6 +137,9 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
   GList *list, *item;
   GstElement *choice = NULL;
   gboolean ss = TRUE;
+  GstMessage *message = NULL;
+  GSList *errors = NULL;
+  GstBus *bus = gst_bus_new ();
 
   list = gst_registry_feature_filter (gst_registry_get_default (),
       (GstPluginFeatureFilter) gst_auto_audio_sink_factory_filter, FALSE, sink);
@@ -145,17 +148,21 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
   /* FIXME:
    * - soundservers have no priority yet.
    * - soundserversinks should only be chosen if already running, or if
-   *    the user explicitely wants this to run... That is not easy.
+   *    the user explicitly wants this to run... That is not easy.
    */
 
   while (1) {
-    GST_LOG ("Trying to find %s", ss ? "soundservers" : "audio devices");
+    GST_DEBUG_OBJECT (sink, "Trying to find %s",
+        ss ? "soundservers" : "audio devices");
 
     for (item = list; item != NULL; item = item->next) {
       GstElementFactory *f = GST_ELEMENT_FACTORY (item->data);
       GstElement *el;
 
       if ((el = gst_element_factory_create (f, "actual-sink"))) {
+        /* FIXME: no element actually has this property as far as I can tell.
+         * also, this is a nasty uncheckable way of supporting something that
+         * amounts to being an interface. */
         gboolean has_p = g_object_class_find_property (G_OBJECT_GET_CLASS (el),
             "soundserver-running") ? TRUE : FALSE;
 
@@ -165,22 +172,32 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
 
             g_object_get (G_OBJECT (el), "soundserver-running", &r, NULL);
             if (r) {
-              GST_LOG ("%s - soundserver is running",
+              GST_DEBUG_OBJECT (sink, "%s - soundserver is running",
                   GST_PLUGIN_FEATURE (f)->name);
             } else {
-              GST_LOG ("%s - Soundserver is not running",
+              GST_DEBUG_OBJECT (sink, "%s - Soundserver is not running",
                   GST_PLUGIN_FEATURE (f)->name);
               goto next;
             }
           }
-          GST_LOG ("Testing %s", GST_PLUGIN_FEATURE (f)->name);
+          GST_DEBUG_OBJECT (sink, "Testing %s", GST_PLUGIN_FEATURE (f)->name);
+          gst_element_set_bus (el, bus);
           if (gst_element_set_state (el,
                   GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS) {
             gst_element_set_state (el, GST_STATE_NULL);
-            GST_LOG ("This worked!");
+            GST_DEBUG_OBJECT (sink, "This worked!");
             choice = el;
             goto done;
           } else {
+            /* collect all error messages */
+            while ((message = gst_bus_pop (bus))) {
+              if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) {
+                GST_DEBUG_OBJECT (sink, "appending error message %p", message);
+                errors = g_slist_append (errors, message);
+              } else {
+                gst_message_unref (message);
+              }
+            }
             gst_element_set_state (el, GST_STATE_NULL);
           }
         }
@@ -196,7 +213,24 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
   }
 
 done:
+  GST_DEBUG_OBJECT (sink, "done trying");
+  if (!choice) {
+    if (errors) {
+      /* FIXME: we forward the first error for now; but later on it might make
+       * sense to actually analyse them */
+      gst_message_ref (GST_MESSAGE (errors->data));
+      GST_DEBUG_OBJECT (sink, "reposting message %p", errors->data);
+      gst_element_post_message (GST_ELEMENT (sink), GST_MESSAGE (errors->data));
+    } else {
+      /* general fallback */
+      GST_ELEMENT_ERROR (sink, LIBRARY, INIT, (NULL),
+          ("Failed to find a supported audio sink"));
+    }
+  }
+  gst_object_unref (bus);
   g_list_free (list);
+  g_slist_foreach (errors, (GFunc) gst_mini_object_unref, NULL);
+  g_slist_free (errors);
 
   return choice;
 }
@@ -216,8 +250,6 @@ gst_auto_audio_sink_detect (GstAutoAudioSink * sink)
   /* find element */
   GST_DEBUG_OBJECT (sink, "Creating new kid");
   if (!(esink = gst_auto_audio_sink_find_best (sink))) {
-    GST_ELEMENT_ERROR (sink, LIBRARY, INIT, (NULL),
-        ("Failed to find a supported audio sink"));
     return FALSE;
   }
   sink->kid = esink;
diff --git a/gst/autodetect/gstautodetect.c b/gst/autodetect/gstautodetect.c
index 75f7d6e7..9f02b9c9 100644
--- a/gst/autodetect/gstautodetect.c
+++ b/gst/autodetect/gstautodetect.c
@@ -45,4 +45,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "autodetect",
     "Plugin contains auto-detection plugins for video/audio outputs",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/avi/gstavi.c b/gst/avi/gstavi.c
index 91adeb40..51cfd461 100644
--- a/gst/avi/gstavi.c
+++ b/gst/avi/gstavi.c
@@ -47,4 +47,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "avi",
     "AVI stream handling",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index 89a5723b..05ae543d 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -416,7 +416,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "cutter",
     "Audio Cutter to split audio into non-silent bits",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 
      void gst_cutter_get_caps (GstPad * pad, GstCutter * filter)
 {
diff --git a/gst/debug/efence.c b/gst/debug/efence.c
index a9d70c6b..062fab85 100644
--- a/gst/debug/efence.c
+++ b/gst/debug/efence.c
@@ -320,7 +320,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     "access to data in the buffer is more likely to cause segmentation "
     "faults.  This allocation method is very similar to the debugging tool "
     "\"Electric Fence\".",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 
      static void gst_fenced_buffer_finalize (GstFencedBuffer * buffer)
 {
diff --git a/gst/debug/gstdebug.c b/gst/debug/gstdebug.c
index 8c64588e..958d472d 100644
--- a/gst/debug/gstdebug.c
+++ b/gst/debug/gstdebug.c
@@ -47,4 +47,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "debug",
     "elements for testing and debugging",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/debug/gstnavigationtest.c b/gst/debug/gstnavigationtest.c
index de7d5e96..9b40fc1e 100644
--- a/gst/debug/gstnavigationtest.c
+++ b/gst/debug/gstnavigationtest.c
@@ -312,4 +312,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "navigationtest",
     "Template for a video filter",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/effectv/gsteffectv.c b/gst/effectv/gsteffectv.c
index f7aa6246..5a051b63 100644
--- a/gst/effectv/gsteffectv.c
+++ b/gst/effectv/gsteffectv.c
@@ -82,4 +82,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "effectv",
     "effect plugins from the effectv project",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index bb86916b..1d50a9c7 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -669,4 +669,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "flxdec",
     "FLX video decoder",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index 2592f854..a7e7708c 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -454,4 +454,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "goom",
     "GOOM visualization filter",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/law/alaw.c b/gst/law/alaw.c
index 252e3c81..fd481fa9 100644
--- a/gst/law/alaw.c
+++ b/gst/law/alaw.c
@@ -58,4 +58,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "alaw",
     "ALaw audio conversion routines",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/law/mulaw.c b/gst/law/mulaw.c
index 7b7d222d..4a288065 100644
--- a/gst/law/mulaw.c
+++ b/gst/law/mulaw.c
@@ -58,4 +58,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "mulaw",
     "MuLaw audio conversion routines",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 9a15caf4..acd60679 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -552,4 +552,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "level",
     "Audio level plugin",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/matroska/matroska.c b/gst/matroska/matroska.c
index b274b945..5156ca57 100644
--- a/gst/matroska/matroska.c
+++ b/gst/matroska/matroska.c
@@ -37,4 +37,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "matroska",
     "Matroska stream handling",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c
index 7bfa33a4..4327c009 100644
--- a/gst/median/gstmedian.c
+++ b/gst/median/gstmedian.c
@@ -430,4 +430,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "median",
     "Video median filter",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index f3916d48..4497d9ce 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -300,4 +300,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "monoscope",
     "Monoscope visualization",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
diff --git a/gst/multipart/multipart.c b/gst/multipart/multipart.c
index 802653fb..871f9872 100644
--- a/gst/multipart/multipart.c
+++ b/gst/multipart/multipart.c
@@ -41,4 +41,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "multipart",
     "multipart stream manipulation",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/oldcore/gstelements.c b/gst/oldcore/gstelements.c
index dd832aa9..e99c27cd 100644
--- a/gst/oldcore/gstelements.c
+++ b/gst/oldcore/gstelements.c
@@ -79,4 +79,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "standardelements",
     "standard GStreamer elements",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index b4af38ff..877dbefa 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -20,9 +20,15 @@ libgstrtp_la_SOURCES = \
 
 #gstrtpL16enc.c gstrtpL16parse.c gstrtpgsmenc.c gstrtpgsmparse.c 
 
+if HAVE_WINSOCK2_H
+WINSOCK2_LIBS = -lws2_32
+else
+WINSOCK2_LIBS =
+endif
+
 libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
-                -lgstrtp-@GST_MAJORMINOR@
+                -lgstrtp-@GST_MAJORMINOR@ $(WINSOCK2_LIBS)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 
 noinst_HEADERS = gstrtpL16enc.h 	\
diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c
index 2c27e15e..e38abea3 100644
--- a/gst/rtp/gstasteriskh263.c
+++ b/gst/rtp/gstasteriskh263.c
@@ -17,11 +17,18 @@
 #endif
 
 #include <string.h>
-#include <netinet/in.h>
 
 #include <gst/rtp/gstrtpbuffer.h>
 #include "gstasteriskh263.h"
 
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
+
+#ifdef HAVE_WINSOCK2_H
+#  include <winsock2.h>
+#endif
+
 #define GST_ASTERISKH263_HEADER_LEN 6
 
 typedef struct _GstAsteriskH263Header
diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c
index dd8457b4..07a77e48 100644
--- a/gst/rtp/gstrtp.c
+++ b/gst/rtp/gstrtp.c
@@ -92,4 +92,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "rtp",
     "Real-time protocol plugins",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/rtsp/gstrtsp.c b/gst/rtsp/gstrtsp.c
index 46d79491..8fe43ac9 100644
--- a/gst/rtsp/gstrtsp.c
+++ b/gst/rtsp/gstrtsp.c
@@ -37,4 +37,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "rtsp",
     "transfer data via RTSP",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 70634564..d544fc7d 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -443,4 +443,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "smoothwave",
     "Fading greyscale waveform display",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 1c1f325b..31384ec2 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -491,4 +491,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "smpte",
     "Apply the standard SMPTE transitions on video images",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/udp/gstudp.c b/gst/udp/gstudp.c
index 232d9774..2852917d 100644
--- a/gst/udp/gstudp.c
+++ b/gst/udp/gstudp.c
@@ -51,4 +51,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "udp",
     "transfer data via UDP",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index d97fa291..315b3e2b 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -693,4 +693,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videobox",
     "resizes a video by adding borders or cropping",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/videofilter/gstgamma.c b/gst/videofilter/gstgamma.c
index 72de4f88..fb47e4b6 100644
--- a/gst/videofilter/gstgamma.c
+++ b/gst/videofilter/gstgamma.c
@@ -274,7 +274,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "gamma",
     "Changes gamma on video images",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
 
 static void
diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 65b64aee..0825aa46 100644
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -437,7 +437,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videobalance",
     "Changes hue, saturation, brightness etc. on video images",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
 static void
 gst_videobalance_setup (GstVideofilter * videofilter)
diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c
index 4d6d37d6..324934df 100644
--- a/gst/videofilter/gstvideoflip.c
+++ b/gst/videofilter/gstvideoflip.c
@@ -231,7 +231,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videoflip",
     "Flips and rotates video",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN);
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
 static void gst_videoflip_flip (GstVideoflip * videoflip,
     unsigned char *dest, unsigned char *src, int sw, int sh, int dw, int dh);
diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c
index 8009cd5d..ac0b3e6e 100644
--- a/gst/videofilter/gstvideotemplate.c
+++ b/gst/videofilter/gstvideotemplate.c
@@ -225,7 +225,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videotemplate",
     "Template for a video filter",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
 
      static void gst_videotemplate_setup (GstVideofilter * videofilter)
 {
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index dff53661..8c8c978b 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -1203,4 +1203,5 @@ plugin_init (GstPlugin * plugin)
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "videomixer",
-    "Video mixer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    "Video mixer", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 1cdde378..435db53c 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -694,4 +694,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "wavenc",
     "Encode raw audio into WAV",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index cb0ab683..fdfaba17 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -1390,4 +1390,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "wavparse",
     "Parse a .wav file into raw audio",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)