*** empty log message ***
authormattk
Fri, 06 Jun 2003 11:17:35 +0000
changeset 274 e647d31d12a6
parent 273 b99154c8bca6
child 275 14a1b552e427
*** empty log message ***
ChangeLog
gnome-media.spec
gst-plugins.spec
patches/gst-plugins-01-dvdnav-ext-compile.diff
--- a/ChangeLog	Thu Jun 05 16:56:34 2003 +0000
+++ b/ChangeLog	Fri Jun 06 11:17:35 2003 +0000
@@ -1,3 +1,13 @@
+2003-06-06	Matt Keenan <[email protected]>
+	* patches/gst-plugins-01-dvdnav-ext-compile.diff
+		dvdnav API compile error Hack to compile
+
+	* gst-plugins.spec
+		Added above patch
+
+	* gnome-media.spec
+		Added BuildDependency for gstreamer-plugins-devel
+	
 2003-06-05	Matt Keenan <[email protected]>
 	
 	* esound.spec : Remove as we are not building anymore
--- a/gnome-media.spec	Thu Jun 05 16:56:34 2003 +0000
+++ b/gnome-media.spec	Fri Jun 06 11:17:35 2003 +0000
@@ -12,6 +12,16 @@
 Docdir:       %{_docdir}
 Autoreqprov:  on
 
+%define 	gstreamer_version 		0.5.1
+%define 	gstreamer_devel_version 	0.5.1
+%define 	gstreamer_plugins_version 	0.5.1
+%define 	gstreamer_plugins_devel_version 	0.5.1
+
+Requires: 	gstreamer >= %{gstreamer_version}
+Requires: 	gstreamer-plugins >= %{gstreamer_plugins_version}
+BuildRequires:  gstreamer-devel >= %{gstreamer_devel_version}
+BuildRequires: 	gstreamer-plugins-devel => %{gstreamer_plugins_devel_version}
+
 %description
 This package contains some multimedia programs for GNOME.
 
--- a/gst-plugins.spec	Thu Jun 05 16:56:34 2003 +0000
+++ b/gst-plugins.spec	Fri Jun 06 11:17:35 2003 +0000
@@ -16,6 +16,7 @@
 License: 	LGPL
 URL:		http://gstreamer.net/
 Source:         http://gstreamer.net/releases/%{version}/src/gst-plugins-%{version}.tar.bz2
+Patch0:         gst-plugins-01-dvdnav-ext-compile.diff
 BuildRoot: 	%{_tmppath}/gst-plugins-%{version}-root
 
 %define 	majorminor	0.6
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q -n gst-plugins-%{version}
+%patch0
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gst-plugins-01-dvdnav-ext-compile.diff	Fri Jun 06 11:17:35 2003 +0000
@@ -0,0 +1,51 @@
+--- ../gst-plugins-0.6.0/ext/dvdnav/dvdnavsrc.c	2003-01-09 08:56:58.000000000 +0000
++++ ext/dvdnav/dvdnavsrc.c	2003-06-06 11:11:14.000000000 +0100
+@@ -591,13 +591,13 @@
+ static void
+ dvdnavsrc_pointer_select (DVDNavSrc *src, int x, int y)
+ {
+-  dvdnav_mouse_select(src->dvdnav, x, y);
++  dvdnav_mouse_select(src->dvdnav, NULL,  x, y);
+ }
+ 
+ static void
+ dvdnavsrc_pointer_activate (DVDNavSrc *src, int x, int y)
+ {
+-  dvdnav_mouse_activate(src->dvdnav, x, y);
++  dvdnav_mouse_activate(src->dvdnav, NULL, x, y);
+ }
+ 
+ static void
+@@ -609,27 +609,27 @@
+     case 0: /* None */
+       break;
+     case 1: /* Upper */
+-      if (dvdnav_upper_button_select(src->dvdnav) != DVDNAV_STATUS_OK) {
++      if (dvdnav_upper_button_select(src->dvdnav, NULL) != DVDNAV_STATUS_OK) {
+         goto naverr;
+       }
+       break;
+     case 2: /* Lower */
+-      if (dvdnav_lower_button_select(src->dvdnav) != DVDNAV_STATUS_OK) {
++      if (dvdnav_lower_button_select(src->dvdnav, NULL) != DVDNAV_STATUS_OK) {
+         goto naverr;
+       }
+       break;
+     case 3: /* Left */
+-      if (dvdnav_left_button_select(src->dvdnav) != DVDNAV_STATUS_OK) {
++      if (dvdnav_left_button_select(src->dvdnav, NULL) != DVDNAV_STATUS_OK) {
+         goto naverr;
+       }
+       break;
+     case 4: /* Right */
+-      if (dvdnav_right_button_select(src->dvdnav) != DVDNAV_STATUS_OK) {
++      if (dvdnav_right_button_select(src->dvdnav, NULL) != DVDNAV_STATUS_OK) {
+         goto naverr;
+       }
+       break;
+     case 5: /* Activate */
+-      if (dvdnav_button_activate(src->dvdnav) != DVDNAV_STATUS_OK) {
++      if (dvdnav_button_activate(src->dvdnav, NULL) != DVDNAV_STATUS_OK) {
+         goto naverr;
+       }
+       break;