Fix build break and warnings on 64bit system

Change-Id: Id6433a5ecd041354cf1fabecbd42eb6b6248c4f5

diff --git a/gst/rtsp-server/gstwfdmessage.c b/gst/rtsp-server/gstwfdmessage.c
index 3bff785..759216d 100644 (file)
--- a/gst/rtsp-server/gstwfdmessage.c
+++ b/gst/rtsp-server/gstwfdmessage.c
@@ -1116,9 +1116,9 @@ gst_wfd_message_as_text (const GstWFDMessage * msg)
   if (msg->av_format_change_timing) {
     g_string_append_printf (lines, "wfd_av_format_change_timing");
     g_string_append_printf (lines, ":");
-    g_string_append_printf (lines, " %10llu",
+    g_string_append_printf (lines, " %10"G_GUINT64_FORMAT,
         msg->av_format_change_timing->PTS);
-    g_string_append_printf (lines, " %10llu",
+    g_string_append_printf (lines, " %10"G_GUINT64_FORMAT,
         msg->av_format_change_timing->DTS);
     g_string_append_printf (lines, "\r\n");
   }
@@ -1127,7 +1127,7 @@ gst_wfd_message_as_text (const GstWFDMessage * msg)
     g_string_append_printf (lines, "wfd_preferred_display_mode");
     g_string_append_printf (lines, ":");
     if (msg->preferred_display_mode->displaymodesupported) {
-      g_string_append_printf (lines, " %06llu",
+      g_string_append_printf (lines, " %06"G_GUINT64_FORMAT,
           msg->preferred_display_mode->p_clock);
       g_string_append_printf (lines, " %04x", msg->preferred_display_mode->H);
       g_string_append_printf (lines, " %04x", msg->preferred_display_mode->HB);

diff --git a/gst/rtsp-server/rtsp-client-wfd.c b/gst/rtsp-server/rtsp-client-wfd.c
index 75a5202..97d5fba 100644 (file)
--- a/gst/rtsp-server/rtsp-client-wfd.c
+++ b/gst/rtsp-server/rtsp-client-wfd.c
@@ -1995,7 +1995,7 @@ gst_rtsp_wfd_client_set_video_supported_resolution (GstRTSPWFDClient * client,
   GstRTSPResult res = GST_RTSP_OK;
   GstRTSPWFDClientPrivate *priv = GST_RTSP_WFD_CLIENT_GET_PRIVATE (client);
   priv->video_resolution_supported = supported_reso;
-  GST_DEBUG ("Resolution : %lld", supported_reso);
+  GST_DEBUG ("Resolution : %"G_GUINT64_FORMAT, supported_reso);
 
   return res;
 }

diff --git a/gst/rtsp-server/rtsp-media-factory-wfd.c b/gst/rtsp-server/rtsp-media-factory-wfd.c
index 5bf7c5b..137930a 100644 (file)
--- a/gst/rtsp-server/rtsp-media-factory-wfd.c
+++ b/gst/rtsp-server/rtsp-media-factory-wfd.c
@@ -317,9 +317,9 @@ _rtsp_media_factory_wfd_create_audio_capture_bin (GstRTSPMediaFactoryWFD *
   }
 
   GST_INFO_OBJECT (factory, "audio device : %s", priv->audio_device);
-  GST_INFO_OBJECT (factory, "audio latency time  : %lld",
+  GST_INFO_OBJECT (factory, "audio latency time  : %"G_GUINT64_FORMAT,
       priv->audio_latency_time);
-  GST_INFO_OBJECT (factory, "audio_buffer_time  : %lld",
+  GST_INFO_OBJECT (factory, "audio_buffer_time  : %"G_GUINT64_FORMAT,
       priv->audio_buffer_time);
   GST_INFO_OBJECT (factory, "audio_do_timestamp  : %d",
       priv->audio_do_timestamp);

diff --git a/packaging/gst-rtsp-server.spec b/packaging/gst-rtsp-server.spec
index c457923..2a1edc5 100755 (executable)
--- a/packaging/gst-rtsp-server.spec
+++ b/packaging/gst-rtsp-server.spec
@@ -39,11 +39,10 @@ CFLAGS+=" -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "; expor
 LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--hash-style=both -Wl,--as-needed"; export LDFLAGS
 
 # always enable sdk build. This option should go away
-./configure --enable-sdk --prefix=%{_prefix} --disable-static
+%configure --disable-static
 
 # Call make instruction with smp support
-#make %{?jobs:-j%jobs}
-make
+make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}

diff --git a/packaging/orig/gst-rtsp.spec b/packaging/orig/gst-rtsp.spec
deleted file mode 100644 (file)
index 8033373..0000000
--- a/packaging/orig/gst-rtsp.spec
+++ /dev/null
@@ -1,54 +0,0 @@
-%define         gst_majorminor 1.0
-
-Name:           gstreamer-rtsp-server
-Version:        1.4.1
-Release:        1%{?dist}
-Summary:        GStreamer based RTSP server
-Vendor:                Collabora Multimedia
-Group:          Applications/Multimedia
-License:        LGPLv2+
-Source0:        gst-rtsp-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gstreamer-devel >= 0.10.11
-
-
-%description
-This is a RTSP server using the GStreamer framework.
-
-
-%prep
-%setup -q -n gst-rtsp-%{version}
-
-
-%build
-%configure
-
-make
-
-%install
-%makeinstall
-
-# Clean out files that should not be part of the rpm.
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL docs/design/gst-rtp-server-design
-%{_bindir}/gst-rtsp-server
-
-%changelog
-* Thu Oct 9 2008 Christian Schaller <christian.schaller@collabora.co.uk>
-- First spec file

diff --git a/packaging/orig/gst-rtsp.spec.in b/packaging/orig/gst-rtsp.spec.in
deleted file mode 100644 (file)
index 12224f8..0000000
--- a/packaging/orig/gst-rtsp.spec.in
+++ /dev/null
@@ -1,54 +0,0 @@
-%define         gst_majorminor @GST_API_VERSION@
-
-Name:           gstreamer-rtsp-server
-Version:        @VERSION@
-Release:        1%{?dist}
-Summary:        GStreamer based RTSP server
-Vendor:                Collabora Multimedia
-Group:          Applications/Multimedia
-License:        LGPLv2+
-Source0:        gst-rtsp-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gstreamer-devel >= 0.10.11
-
-
-%description
-This is a RTSP server using the GStreamer framework.
-
-
-%prep
-%setup -q -n gst-rtsp-%{version}
-
-
-%build
-%configure
-
-make
-
-%install
-%makeinstall
-
-# Clean out files that should not be part of the rpm.
-rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL docs/design/gst-rtp-server-design
-%{_bindir}/gst-rtsp-server
-
-%changelog
-* Thu Oct 9 2008 Christian Schaller <christian.schaller@collabora.co.uk>
-- First spec file