From c5034a716dc10e9d631d2b447faad2089a432284 Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Thu, 11 Mar 2010 09:29:53 -0300
Subject: [PATCH] metadata: Remove _XMP_GEO_* tags

Removes GST_TAG_XMP_GEO_LOCATION_COUNTRY,
GST_TAG_XMP_GEO_LOCATION_CITY and
GST_TAG_XMP_GEO_LOCATION_SUBLOCATION from metadata's
private tags as those are now present at -core tags.

Fixes #612410
---
 configure.ac                |  2 +-
 ext/metadata/metadatatags.c | 12 ------------
 ext/metadata/metadatatags.h |  4 ----
 ext/metadata/metadataxmp.c  |  6 +++---
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 86814f9729..6659a53b38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.27
+GST_REQ=0.10.28.1
 GSTPB_REQ=0.10.27
 
 dnl *** autotools stuff ****
diff --git a/ext/metadata/metadatatags.c b/ext/metadata/metadatatags.c
index 9d25ef8fee..ba12133089 100644
--- a/ext/metadata/metadatatags.c
+++ b/ext/metadata/metadatatags.c
@@ -446,17 +446,5 @@ metadata_tags_iptc_register (void)
 static void
 metadata_tags_xmp_register (void)
 {
-  gst_tag_register (GST_TAG_XMP_GEO_LOCATION_COUNTRY, GST_TAG_FLAG_META,
-      G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_COUNTRY,
-      "human readable english country name of where the media has been recorded or produced",
-      NULL);
-  gst_tag_register (GST_TAG_XMP_GEO_LOCATION_CITY, GST_TAG_FLAG_META,
-      G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_CITY,
-      "human readable english city name of where the media has been recorded or produced",
-      NULL);
-  gst_tag_register (GST_TAG_XMP_GEO_LOCATION_SUBLOCATION, GST_TAG_FLAG_META,
-      G_TYPE_STRING, GST_TAG_XMP_GEO_LOCATION_SUBLOCATION,
-      "human readable location detail of where the media has been recorded or produced",
-      NULL);
 
 }
diff --git a/ext/metadata/metadatatags.h b/ext/metadata/metadatatags.h
index 4d718738be..8500f15aa7 100644
--- a/ext/metadata/metadatatags.h
+++ b/ext/metadata/metadatatags.h
@@ -126,10 +126,6 @@ typedef enum {
 #define GST_TAG_GPS_SPEED                  "" 
 #define GST_TAG_GPS_TRACK                  ""
 
-#define GST_TAG_XMP_GEO_LOCATION_COUNTRY   "geo-location-country"
-#define GST_TAG_XMP_GEO_LOCATION_CITY      "geo-location-city"
-#define GST_TAG_XMP_GEO_LOCATION_SUBLOCATION  "geo-location-sublocation"
-
 /* *INDENT-ON* */
 
 /*
diff --git a/ext/metadata/metadataxmp.c b/ext/metadata/metadataxmp.c
index fc9fb42523..98f2f87f97 100644
--- a/ext/metadata/metadataxmp.c
+++ b/ext/metadata/metadataxmp.c
@@ -168,13 +168,13 @@ static const SchemaTagMap schema_map_dublin_tags_map[] = {
 };
 
 static const SchemaTagMap schema_map_photoshop_tags_map[] = {
-  {"Country",     GST_TAG_XMP_GEO_LOCATION_COUNTRY },
-  {"City",        GST_TAG_XMP_GEO_LOCATION_CITY   },
+  {"Country",     GST_TAG_GEO_LOCATION_COUNTRY },
+  {"City",        GST_TAG_GEO_LOCATION_CITY   },
   {NULL, NULL}
 };
 
 static const SchemaTagMap schema_map_iptc4xmpcore_tags_map[] = {
-  {"location",    GST_TAG_XMP_GEO_LOCATION_SUBLOCATION },
+  {"location",    GST_TAG_GEO_LOCATION_SUBLOCATION },
   {NULL, NULL}
 };
 /* *INDENT-ON* */