rpms/gecko-mediaplayer/F-10 gecko-mediaplayer-0.9.3-console.patch, NONE, 1.1 gecko-mediaplayer.spec, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31485
Modified Files:
gecko-mediaplayer.spec
Added Files:
gecko-mediaplayer-0.9.3-console.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #290 from SVN
gecko-mediaplayer-0.9.3-console.patch:
--- NEW FILE gecko-mediaplayer-0.9.3-console.patch ---
Index: src/plugin_setup.cpp
===================================================================
--- src/plugin_setup.cpp (wersja 262)
+++ src/plugin_setup.cpp (wersja 263)
@@ -42,7 +42,7 @@
void new_instance(nsPluginInstance * instance, nsPluginCreateData * parameters)
{
- gint i;
+ gint i,j;
gint newwindow = 0;
gint loop = 0;
gboolean autohref = FALSE;
@@ -71,6 +71,11 @@
if (g_ascii_strcasecmp(parameters->argn[i], "console") == 0) {
instance->console = g_strdup(parameters->argv[i]);
+ for (j = 0; j < strlen(instance->console); j++) {
+ if (!g_ascii_isalnum(instance->console[j])) {
+ instance->console[j] = 'a';
+ }
+ }
}
if (g_ascii_strcasecmp(parameters->argn[i], "controls") == 0) {
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-10/gecko-mediaplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gecko-mediaplayer.spec 3 Jan 2009 08:59:45 -0000 1.10
+++ gecko-mediaplayer.spec 8 Jan 2009 18:35:00 -0000 1.11
@@ -1,12 +1,13 @@
Name: gecko-mediaplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gecko-mediaplayer/
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gecko-mediaplayer-0.9.3-console.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
@@ -32,6 +33,7 @@
%prep
%setup -q
+%patch0 -p0 -b .console
%build
@@ -95,6 +97,9 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #290 from SVN
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months
rpms/gecko-mediaplayer/devel gecko-mediaplayer-0.9.3-console.patch, NONE, 1.1 gecko-mediaplayer.spec, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31377
Modified Files:
gecko-mediaplayer.spec
Added Files:
gecko-mediaplayer-0.9.3-console.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #290 from SVN
gecko-mediaplayer-0.9.3-console.patch:
--- NEW FILE gecko-mediaplayer-0.9.3-console.patch ---
Index: src/plugin_setup.cpp
===================================================================
--- src/plugin_setup.cpp (wersja 262)
+++ src/plugin_setup.cpp (wersja 263)
@@ -42,7 +42,7 @@
void new_instance(nsPluginInstance * instance, nsPluginCreateData * parameters)
{
- gint i;
+ gint i,j;
gint newwindow = 0;
gint loop = 0;
gboolean autohref = FALSE;
@@ -71,6 +71,11 @@
if (g_ascii_strcasecmp(parameters->argn[i], "console") == 0) {
instance->console = g_strdup(parameters->argv[i]);
+ for (j = 0; j < strlen(instance->console); j++) {
+ if (!g_ascii_isalnum(instance->console[j])) {
+ instance->console[j] = 'a';
+ }
+ }
}
if (g_ascii_strcasecmp(parameters->argn[i], "controls") == 0) {
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gecko-mediaplayer.spec 3 Jan 2009 08:59:36 -0000 1.10
+++ gecko-mediaplayer.spec 8 Jan 2009 18:34:49 -0000 1.11
@@ -1,12 +1,13 @@
Name: gecko-mediaplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gecko-mediaplayer/
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gecko-mediaplayer-0.9.3-console.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
@@ -32,6 +33,7 @@
%prep
%setup -q
+%patch0 -p0 -b .console
%build
@@ -95,6 +97,9 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #290 from SVN
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months
rpms/gnome-mplayer/F-9 gnome-mplayer-0.9.3-playlist.patch, NONE, 1.1 gnome-mplayer.spec, 1.12, 1.13
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29615
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.3-playlist.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #238 from SVN
- Made the dependencies between packages stricter (%{version} → %{version}-%{release})
gnome-mplayer-0.9.3-playlist.patch:
--- NEW FILE gnome-mplayer-0.9.3-playlist.patch ---
Index: src/playlist.c
===================================================================
--- src/playlist.c (wersja 1092)
+++ src/playlist.c (wersja 1093)
@@ -1008,8 +1008,8 @@
gtk_paned_pack2(GTK_PANED(pane), plvbox, TRUE, TRUE);
adjust_paned_rules();
-
- // Style doesn't seem to have this property
+
+ move_pane_position = TRUE;
gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
if (vertical_layout) {
gtk_widget_set_size_request(plvbox, -1, 150);
Index: src/thread.c
===================================================================
--- src/thread.c (wersja 1092)
+++ src/thread.c (wersja 1093)
@@ -722,7 +722,7 @@
g_idle_add(set_progress_value, idledata);
g_idle_add(set_progress_text, idledata);
g_idle_add(set_media_info, idledata);
- //g_idle_add(set_window_visible, idledata);
+ g_idle_add(set_window_visible, idledata);
if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
argv[arg++] = g_strdup_printf("mplayer");
Index: src/main.c
===================================================================
--- src/main.c (wersja 1092)
+++ src/main.c (wersja 1093)
@@ -156,7 +156,7 @@
GtkRecentData *recent_data;
GtkRecentInfo *recent_info;
#endif
-
+
if (gtk_list_store_iter_is_valid(playliststore, playiter)) {
gtk_tree_model_get(GTK_TREE_MODEL(playliststore), playiter, ITEM_COLUMN, &uri,
DESCRIPTION_COLUMN, &title,
@@ -541,6 +541,7 @@
disable_cover_art_fetch = FALSE;
mixer = NULL;
fullscreen = 0;
+ move_pane_position = FALSE;
sa.sa_handler = hup_handler;
sigemptyset(&sa.sa_mask);
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 1092)
+++ src/gui.c (wersja 1093)
@@ -60,8 +60,8 @@
void adjust_paned_rules()
{
+ return;
if (!idledata->videopresent) {
-
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), GTK_PANED(pane)->child1);
gtk_paned_pack1(GTK_PANED(pane), vbox, FALSE, FALSE);
@@ -81,7 +81,7 @@
{
gint position;
- g_object_get(pane, "position", &position, NULL);
+ g_object_get(pane, "position", &position, NULL);
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), vbox);
gtk_paned_pack1(GTK_PANED(pane), vbox, TRUE, TRUE);
@@ -466,10 +466,14 @@
gboolean set_window_visible(void *data)
{
-
+ //gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist),FALSE);
if (GTK_IS_WIDGET(fixed)) {
- gtk_widget_show_all(fixed);
- }
+ if (vertical_layout) {
+ gtk_widget_show(fixed);
+ } else {
+ gtk_widget_show(vbox);
+ }
+ }
return FALSE;
}
@@ -794,6 +798,7 @@
IdleData *idle = (IdleData *) data;
gint total_height = 0;
gint total_width = 0;
+ gint handle_size;
GTimeVal currenttime;
if (GTK_IS_WIDGET(window)) {
@@ -838,8 +843,15 @@
total_width = idle->width;
if (GTK_IS_WIDGET(plvbox) && GTK_WIDGET_VISIBLE(plvbox)) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
total_height += plvbox->allocation.height;
- total_width = idle->width + plvbox->allocation.width;
+ total_width = idle->width + plvbox->allocation.width + handle_size;
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idle->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idle->width);
+ }
+ move_pane_position = TRUE;
}
gtk_window_resize(GTK_WINDOW(window), total_width, total_height);
@@ -1272,6 +1284,7 @@
gdouble movie_ratio, window_ratio;
gint new_width, new_height;
+ gint handle_size;
if (actual_x > 0 && actual_y > 0) {
@@ -1292,14 +1305,29 @@
} else {
if (movie_ratio > window_ratio) {
//printf("movie %lf > window %lf\n",movie_ratio,window_ratio);
- new_width = allocation->width;
- new_height = allocation->width / movie_ratio;
+ new_width = allocation->width;
+ new_height = allocation->width / movie_ratio;
} else {
//printf("movie %lf < window %lf\n",movie_ratio,window_ratio);
- new_height = allocation->height;
- new_width = allocation->height * movie_ratio;
+ new_height = allocation->height;
+ new_width = allocation->height * movie_ratio;
}
}
+
+ //printf("new_width %i new_height %i\n",new_width, new_height);
+ if (move_pane_position) {
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist))) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->width);
+ }
+ }
+ move_pane_position = FALSE;
+ }
+ printf("new_width %i new_height %i\n",new_width, new_height);
+
gtk_widget_set_size_request(drawing_area, new_width, new_height);
gtk_widget_set_size_request(fixed, allocation->width, allocation->height);
idledata->x = (allocation->width - new_width) / 2;
Index: src/common.h
===================================================================
--- src/common.h (wersja 1092)
+++ src/common.h (wersja 1093)
@@ -301,6 +301,7 @@
gboolean load_tracks_from_gpod;
gchar *gpod_mount_point;
gboolean disable_cover_art_fetch;
+gboolean move_pane_position;
gboolean remember_loc;
gint loc_window_x;
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-9/gnome-mplayer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-mplayer.spec 3 Jan 2009 08:56:57 -0000 1.12
+++ gnome-mplayer.spec 8 Jan 2009 18:04:00 -0000 1.13
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gnome-mplayer/
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.3-playlist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -22,9 +23,9 @@
Requires: gvfs-fuse
Requires: mencoder
-Requires: %{name}-common = %{version}
+Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-binary = %{version}
+Provides: %{name}-binary = %{version}-%{release}
%description
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -52,8 +53,8 @@
%package minimal
Summary: An MPlayer GUI, a minimal version
Group: Applications/Multimedia
-Requires: %{name}-common = %{version}
-Provides: %{name}-binary = %{version}
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-binary = %{version}-%{release}
%description minimal
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -71,6 +72,14 @@
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .playlist
+popd
+
+pushd minimal
+%patch0 -p0 -b .playlist
+popd
+
%build
pushd generic
@@ -161,6 +170,10 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #238 from SVN
+- Made the dependencies between packages stricter (%%{version} → %%{version}-%%{release})
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months
rpms/gnome-mplayer/F-10 gnome-mplayer-0.9.3-playlist.patch, NONE, 1.1 gnome-mplayer.spec, 1.11, 1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29508
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.3-playlist.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #238 from SVN
- Made the dependencies between packages stricter (%{version} → %{version}-%{release})
gnome-mplayer-0.9.3-playlist.patch:
--- NEW FILE gnome-mplayer-0.9.3-playlist.patch ---
Index: src/playlist.c
===================================================================
--- src/playlist.c (wersja 1092)
+++ src/playlist.c (wersja 1093)
@@ -1008,8 +1008,8 @@
gtk_paned_pack2(GTK_PANED(pane), plvbox, TRUE, TRUE);
adjust_paned_rules();
-
- // Style doesn't seem to have this property
+
+ move_pane_position = TRUE;
gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
if (vertical_layout) {
gtk_widget_set_size_request(plvbox, -1, 150);
Index: src/thread.c
===================================================================
--- src/thread.c (wersja 1092)
+++ src/thread.c (wersja 1093)
@@ -722,7 +722,7 @@
g_idle_add(set_progress_value, idledata);
g_idle_add(set_progress_text, idledata);
g_idle_add(set_media_info, idledata);
- //g_idle_add(set_window_visible, idledata);
+ g_idle_add(set_window_visible, idledata);
if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
argv[arg++] = g_strdup_printf("mplayer");
Index: src/main.c
===================================================================
--- src/main.c (wersja 1092)
+++ src/main.c (wersja 1093)
@@ -156,7 +156,7 @@
GtkRecentData *recent_data;
GtkRecentInfo *recent_info;
#endif
-
+
if (gtk_list_store_iter_is_valid(playliststore, playiter)) {
gtk_tree_model_get(GTK_TREE_MODEL(playliststore), playiter, ITEM_COLUMN, &uri,
DESCRIPTION_COLUMN, &title,
@@ -541,6 +541,7 @@
disable_cover_art_fetch = FALSE;
mixer = NULL;
fullscreen = 0;
+ move_pane_position = FALSE;
sa.sa_handler = hup_handler;
sigemptyset(&sa.sa_mask);
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 1092)
+++ src/gui.c (wersja 1093)
@@ -60,8 +60,8 @@
void adjust_paned_rules()
{
+ return;
if (!idledata->videopresent) {
-
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), GTK_PANED(pane)->child1);
gtk_paned_pack1(GTK_PANED(pane), vbox, FALSE, FALSE);
@@ -81,7 +81,7 @@
{
gint position;
- g_object_get(pane, "position", &position, NULL);
+ g_object_get(pane, "position", &position, NULL);
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), vbox);
gtk_paned_pack1(GTK_PANED(pane), vbox, TRUE, TRUE);
@@ -466,10 +466,14 @@
gboolean set_window_visible(void *data)
{
-
+ //gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist),FALSE);
if (GTK_IS_WIDGET(fixed)) {
- gtk_widget_show_all(fixed);
- }
+ if (vertical_layout) {
+ gtk_widget_show(fixed);
+ } else {
+ gtk_widget_show(vbox);
+ }
+ }
return FALSE;
}
@@ -794,6 +798,7 @@
IdleData *idle = (IdleData *) data;
gint total_height = 0;
gint total_width = 0;
+ gint handle_size;
GTimeVal currenttime;
if (GTK_IS_WIDGET(window)) {
@@ -838,8 +843,15 @@
total_width = idle->width;
if (GTK_IS_WIDGET(plvbox) && GTK_WIDGET_VISIBLE(plvbox)) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
total_height += plvbox->allocation.height;
- total_width = idle->width + plvbox->allocation.width;
+ total_width = idle->width + plvbox->allocation.width + handle_size;
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idle->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idle->width);
+ }
+ move_pane_position = TRUE;
}
gtk_window_resize(GTK_WINDOW(window), total_width, total_height);
@@ -1272,6 +1284,7 @@
gdouble movie_ratio, window_ratio;
gint new_width, new_height;
+ gint handle_size;
if (actual_x > 0 && actual_y > 0) {
@@ -1292,14 +1305,29 @@
} else {
if (movie_ratio > window_ratio) {
//printf("movie %lf > window %lf\n",movie_ratio,window_ratio);
- new_width = allocation->width;
- new_height = allocation->width / movie_ratio;
+ new_width = allocation->width;
+ new_height = allocation->width / movie_ratio;
} else {
//printf("movie %lf < window %lf\n",movie_ratio,window_ratio);
- new_height = allocation->height;
- new_width = allocation->height * movie_ratio;
+ new_height = allocation->height;
+ new_width = allocation->height * movie_ratio;
}
}
+
+ //printf("new_width %i new_height %i\n",new_width, new_height);
+ if (move_pane_position) {
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist))) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->width);
+ }
+ }
+ move_pane_position = FALSE;
+ }
+ printf("new_width %i new_height %i\n",new_width, new_height);
+
gtk_widget_set_size_request(drawing_area, new_width, new_height);
gtk_widget_set_size_request(fixed, allocation->width, allocation->height);
idledata->x = (allocation->width - new_width) / 2;
Index: src/common.h
===================================================================
--- src/common.h (wersja 1092)
+++ src/common.h (wersja 1093)
@@ -301,6 +301,7 @@
gboolean load_tracks_from_gpod;
gchar *gpod_mount_point;
gboolean disable_cover_art_fetch;
+gboolean move_pane_position;
gboolean remember_loc;
gint loc_window_x;
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-10/gnome-mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-mplayer.spec 3 Jan 2009 08:56:47 -0000 1.11
+++ gnome-mplayer.spec 8 Jan 2009 18:03:44 -0000 1.12
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gnome-mplayer/
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.3-playlist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -22,9 +23,9 @@
Requires: gvfs-fuse
Requires: mencoder
-Requires: %{name}-common = %{version}
+Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-binary = %{version}
+Provides: %{name}-binary = %{version}-%{release}
%description
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -52,8 +53,8 @@
%package minimal
Summary: An MPlayer GUI, a minimal version
Group: Applications/Multimedia
-Requires: %{name}-common = %{version}
-Provides: %{name}-binary = %{version}
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-binary = %{version}-%{release}
%description minimal
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -71,6 +72,14 @@
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .playlist
+popd
+
+pushd minimal
+%patch0 -p0 -b .playlist
+popd
+
%build
pushd generic
@@ -161,6 +170,10 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #238 from SVN
+- Made the dependencies between packages stricter (%%{version} → %%{version}-%%{release})
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months
rpms/gnome-mplayer/devel gnome-mplayer-0.9.3-playlist.patch, NONE, 1.1 gnome-mplayer.spec, 1.11, 1.12
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29156
Modified Files:
gnome-mplayer.spec
Added Files:
gnome-mplayer-0.9.3-playlist.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #238 from SVN
- Made the dependencies between packages stricter (%{version} → %{version}-%{release})
gnome-mplayer-0.9.3-playlist.patch:
--- NEW FILE gnome-mplayer-0.9.3-playlist.patch ---
Index: src/playlist.c
===================================================================
--- src/playlist.c (wersja 1092)
+++ src/playlist.c (wersja 1093)
@@ -1008,8 +1008,8 @@
gtk_paned_pack2(GTK_PANED(pane), plvbox, TRUE, TRUE);
adjust_paned_rules();
-
- // Style doesn't seem to have this property
+
+ move_pane_position = TRUE;
gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
if (vertical_layout) {
gtk_widget_set_size_request(plvbox, -1, 150);
Index: src/thread.c
===================================================================
--- src/thread.c (wersja 1092)
+++ src/thread.c (wersja 1093)
@@ -722,7 +722,7 @@
g_idle_add(set_progress_value, idledata);
g_idle_add(set_progress_text, idledata);
g_idle_add(set_media_info, idledata);
- //g_idle_add(set_window_visible, idledata);
+ g_idle_add(set_window_visible, idledata);
if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) {
argv[arg++] = g_strdup_printf("mplayer");
Index: src/main.c
===================================================================
--- src/main.c (wersja 1092)
+++ src/main.c (wersja 1093)
@@ -156,7 +156,7 @@
GtkRecentData *recent_data;
GtkRecentInfo *recent_info;
#endif
-
+
if (gtk_list_store_iter_is_valid(playliststore, playiter)) {
gtk_tree_model_get(GTK_TREE_MODEL(playliststore), playiter, ITEM_COLUMN, &uri,
DESCRIPTION_COLUMN, &title,
@@ -541,6 +541,7 @@
disable_cover_art_fetch = FALSE;
mixer = NULL;
fullscreen = 0;
+ move_pane_position = FALSE;
sa.sa_handler = hup_handler;
sigemptyset(&sa.sa_mask);
Index: src/gui.c
===================================================================
--- src/gui.c (wersja 1092)
+++ src/gui.c (wersja 1093)
@@ -60,8 +60,8 @@
void adjust_paned_rules()
{
+ return;
if (!idledata->videopresent) {
-
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), GTK_PANED(pane)->child1);
gtk_paned_pack1(GTK_PANED(pane), vbox, FALSE, FALSE);
@@ -81,7 +81,7 @@
{
gint position;
- g_object_get(pane, "position", &position, NULL);
+ g_object_get(pane, "position", &position, NULL);
g_object_ref(vbox);
gtk_container_remove(GTK_CONTAINER(pane), vbox);
gtk_paned_pack1(GTK_PANED(pane), vbox, TRUE, TRUE);
@@ -466,10 +466,14 @@
gboolean set_window_visible(void *data)
{
-
+ //gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist),FALSE);
if (GTK_IS_WIDGET(fixed)) {
- gtk_widget_show_all(fixed);
- }
+ if (vertical_layout) {
+ gtk_widget_show(fixed);
+ } else {
+ gtk_widget_show(vbox);
+ }
+ }
return FALSE;
}
@@ -794,6 +798,7 @@
IdleData *idle = (IdleData *) data;
gint total_height = 0;
gint total_width = 0;
+ gint handle_size;
GTimeVal currenttime;
if (GTK_IS_WIDGET(window)) {
@@ -838,8 +843,15 @@
total_width = idle->width;
if (GTK_IS_WIDGET(plvbox) && GTK_WIDGET_VISIBLE(plvbox)) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
total_height += plvbox->allocation.height;
- total_width = idle->width + plvbox->allocation.width;
+ total_width = idle->width + plvbox->allocation.width + handle_size;
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idle->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idle->width);
+ }
+ move_pane_position = TRUE;
}
gtk_window_resize(GTK_WINDOW(window), total_width, total_height);
@@ -1272,6 +1284,7 @@
gdouble movie_ratio, window_ratio;
gint new_width, new_height;
+ gint handle_size;
if (actual_x > 0 && actual_y > 0) {
@@ -1292,14 +1305,29 @@
} else {
if (movie_ratio > window_ratio) {
//printf("movie %lf > window %lf\n",movie_ratio,window_ratio);
- new_width = allocation->width;
- new_height = allocation->width / movie_ratio;
+ new_width = allocation->width;
+ new_height = allocation->width / movie_ratio;
} else {
//printf("movie %lf < window %lf\n",movie_ratio,window_ratio);
- new_height = allocation->height;
- new_width = allocation->height * movie_ratio;
+ new_height = allocation->height;
+ new_width = allocation->height * movie_ratio;
}
}
+
+ //printf("new_width %i new_height %i\n",new_width, new_height);
+ if (move_pane_position) {
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem_view_playlist))) {
+ gtk_widget_style_get(pane, "handle-size", &handle_size, NULL);
+ if (vertical_layout) {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->height);
+ } else {
+ gtk_paned_set_position(GTK_PANED(pane),idledata->width);
+ }
+ }
+ move_pane_position = FALSE;
+ }
+ printf("new_width %i new_height %i\n",new_width, new_height);
+
gtk_widget_set_size_request(drawing_area, new_width, new_height);
gtk_widget_set_size_request(fixed, allocation->width, allocation->height);
idledata->x = (allocation->width - new_width) / 2;
Index: src/common.h
===================================================================
--- src/common.h (wersja 1092)
+++ src/common.h (wersja 1093)
@@ -301,6 +301,7 @@
gboolean load_tracks_from_gpod;
gchar *gpod_mount_point;
gboolean disable_cover_art_fetch;
+gboolean move_pane_position;
gboolean remember_loc;
gint loc_window_x;
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-mplayer.spec 3 Jan 2009 08:56:37 -0000 1.11
+++ gnome-mplayer.spec 8 Jan 2009 18:03:27 -0000 1.12
@@ -1,12 +1,13 @@
Name: gnome-mplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gnome-mplayer/
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gnome-mplayer-0.9.3-playlist.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -22,9 +23,9 @@
Requires: gvfs-fuse
Requires: mencoder
-Requires: %{name}-common = %{version}
+Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-binary = %{version}
+Provides: %{name}-binary = %{version}-%{release}
%description
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -52,8 +53,8 @@
%package minimal
Summary: An MPlayer GUI, a minimal version
Group: Applications/Multimedia
-Requires: %{name}-common = %{version}
-Provides: %{name}-binary = %{version}
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-binary = %{version}-%{release}
%description minimal
GNOME MPlayer is a simple GUI for MPlayer. It is intended to be a nice tight
@@ -71,6 +72,14 @@
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
+pushd generic
+%patch0 -p0 -b .playlist
+popd
+
+pushd minimal
+%patch0 -p0 -b .playlist
+popd
+
%build
pushd generic
@@ -161,6 +170,10 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #238 from SVN
+- Made the dependencies between packages stricter (%%{version} → %%{version}-%%{release})
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months
rpms/xine-lib-extras-freeworld/EL-5 xine-lib-1.1.16-ffmpeg_api.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib-extras-freeworld.spec, 1.7, 1.8
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23931
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
xine-lib-1.1.16-ffmpeg_api.patch:
--- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch ---
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600
@@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600
@@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
} else {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Aug 2008 18:13:13 -0000 1.3
+++ .cvsignore 8 Jan 2009 16:24:30 -0000 1.4
@@ -1 +1 @@
-xine-lib-1.1.15.tar.bz2
+xine-lib-1.1.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Aug 2008 18:13:13 -0000 1.3
+++ sources 8 Jan 2009 16:24:30 -0000 1.4
@@ -1 +1 @@
-42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2
+acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/xine-lib-extras-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-extras-freeworld.spec 25 Sep 2008 12:36:42 -0000 1.7
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 16:24:30 -0000 1.8
@@ -1,7 +1,7 @@
# TODO:
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.24
+%define abiver 1.25
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
@@ -9,21 +9,26 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.15
-Release: 4%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.3-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-# External libs
-%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804}
+%if 0%{?_with_external_ffmpeg:1}
+BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
+# HACKS to workaround missing deps in ffmpeg-devel
+# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
+%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -60,9 +65,11 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
+# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%patch100 -p1 -b .ffmpeg_api
+
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -109,18 +116,19 @@
rm -rf %{buildroot}%{_libdir}/lib*
rm -rf %{buildroot}%{_libdir}/pkgconfig
+#xineplug_dmx_mpeg
+#xineplug_dmx_mpeg_block
+#xineplug_dmx_mpeg_ts
+#xineplug_dmx_mpeg_elem
+#xineplug_dmx_mpeg_pes
+#xineplug_dmx_yuv4mpeg2
+
# Plugins - credits go to the SuSE RPM maintainer, congrats
cat > plugins << EOF
#
# libmad and MPEG related plugins
xineplug_decode_mad
xineplug_decode_mpeg2
-xineplug_dmx_mpeg
-xineplug_dmx_mpeg_block
-xineplug_dmx_mpeg_ts
-xineplug_dmx_mpeg_elem
-xineplug_dmx_mpeg_pes
-xineplug_dmx_yuv4mpeg2
xineplug_inp_vcd
xineplug_inp_vcdo
#
@@ -177,6 +185,12 @@
%changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16
+
+* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
+- ffmpeg bits_per_sample patch
+
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-4
- Obsoletes: xine-lib-moles < 1.1.15-2
15 years, 10 months
rpms/xine-lib-extras-freeworld/F-8 xine-lib-1.1.16-ffmpeg_api.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib-extras-freeworld.spec, 1.5, 1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23499
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
xine-lib-1.1.16-ffmpeg_api.patch:
--- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch ---
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600
@@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600
@@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
} else {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Aug 2008 18:21:50 -0000 1.3
+++ .cvsignore 8 Jan 2009 16:22:45 -0000 1.4
@@ -1 +1 @@
-xine-lib-1.1.15.tar.bz2
+xine-lib-1.1.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Aug 2008 18:21:50 -0000 1.3
+++ sources 8 Jan 2009 16:22:45 -0000 1.4
@@ -1 +1 @@
-42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2
+acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/xine-lib-extras-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xine-lib-extras-freeworld.spec 25 Sep 2008 12:36:24 -0000 1.5
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 16:22:45 -0000 1.6
@@ -1,7 +1,7 @@
# TODO:
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.24
+%define abiver 1.25
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
@@ -9,21 +9,26 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.15
-Release: 4%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.3-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-# External libs
-%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804}
+%if 0%{?_with_external_ffmpeg:1}
+BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
+# HACKS to workaround missing deps in ffmpeg-devel
+# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
+%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -60,9 +65,11 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
+# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%patch100 -p1 -b .ffmpeg_api
+
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -109,18 +116,19 @@
rm -rf %{buildroot}%{_libdir}/lib*
rm -rf %{buildroot}%{_libdir}/pkgconfig
+#xineplug_dmx_mpeg
+#xineplug_dmx_mpeg_block
+#xineplug_dmx_mpeg_ts
+#xineplug_dmx_mpeg_elem
+#xineplug_dmx_mpeg_pes
+#xineplug_dmx_yuv4mpeg2
+
# Plugins - credits go to the SuSE RPM maintainer, congrats
cat > plugins << EOF
#
# libmad and MPEG related plugins
xineplug_decode_mad
xineplug_decode_mpeg2
-xineplug_dmx_mpeg
-xineplug_dmx_mpeg_block
-xineplug_dmx_mpeg_ts
-xineplug_dmx_mpeg_elem
-xineplug_dmx_mpeg_pes
-xineplug_dmx_yuv4mpeg2
xineplug_inp_vcd
xineplug_inp_vcdo
#
@@ -177,6 +185,12 @@
%changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16
+
+* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
+- ffmpeg bits_per_sample patch
+
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-4
- Obsoletes: xine-lib-moles < 1.1.15-2
15 years, 10 months
rpms/xine-lib-extras-freeworld/F-9 xine-lib-1.1.16-ffmpeg_api.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib-extras-freeworld.spec, 1.5, 1.6
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20184
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
xine-lib-1.1.16-ffmpeg_api.patch:
--- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch ---
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600
@@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600
@@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
} else {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Aug 2008 18:20:46 -0000 1.3
+++ .cvsignore 8 Jan 2009 15:23:23 -0000 1.4
@@ -1 +1 @@
-xine-lib-1.1.15.tar.bz2
+xine-lib-1.1.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 23 Aug 2008 18:20:46 -0000 1.3
+++ sources 8 Jan 2009 15:23:23 -0000 1.4
@@ -1 +1 @@
-42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2
+acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-9/xine-lib-extras-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xine-lib-extras-freeworld.spec 25 Sep 2008 12:36:04 -0000 1.5
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 15:23:23 -0000 1.6
@@ -1,7 +1,7 @@
# TODO:
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.24
+%define abiver 1.25
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
@@ -9,21 +9,26 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.15
-Release: 4%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.3-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-# External libs
-%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804}
+%if 0%{?_with_external_ffmpeg:1}
+BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
+# HACKS to workaround missing deps in ffmpeg-devel
+# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
+%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -60,9 +65,11 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
+# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%patch100 -p1 -b .ffmpeg_api
+
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -109,18 +116,19 @@
rm -rf %{buildroot}%{_libdir}/lib*
rm -rf %{buildroot}%{_libdir}/pkgconfig
+#xineplug_dmx_mpeg
+#xineplug_dmx_mpeg_block
+#xineplug_dmx_mpeg_ts
+#xineplug_dmx_mpeg_elem
+#xineplug_dmx_mpeg_pes
+#xineplug_dmx_yuv4mpeg2
+
# Plugins - credits go to the SuSE RPM maintainer, congrats
cat > plugins << EOF
#
# libmad and MPEG related plugins
xineplug_decode_mad
xineplug_decode_mpeg2
-xineplug_dmx_mpeg
-xineplug_dmx_mpeg_block
-xineplug_dmx_mpeg_ts
-xineplug_dmx_mpeg_elem
-xineplug_dmx_mpeg_pes
-xineplug_dmx_yuv4mpeg2
xineplug_inp_vcd
xineplug_inp_vcdo
#
@@ -177,6 +185,12 @@
%changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16
+
+* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
+- ffmpeg bits_per_sample patch
+
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-4
- Obsoletes: xine-lib-moles < 1.1.15-2
15 years, 10 months
rpms/xine-lib-extras-freeworld/F-10 xine-lib-1.1.16-ffmpeg_api.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib-extras-freeworld.spec, 1.7, 1.8
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18076
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
xine-lib-1.1.16-ffmpeg_api.patch:
--- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch ---
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600
@@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600
@@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
} else {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Aug 2008 18:13:13 -0000 1.3
+++ .cvsignore 8 Jan 2009 14:48:17 -0000 1.4
@@ -1 +1 @@
-xine-lib-1.1.15.tar.bz2
+xine-lib-1.1.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Aug 2008 18:13:13 -0000 1.3
+++ sources 8 Jan 2009 14:48:17 -0000 1.4
@@ -1 +1 @@
-42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2
+acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/xine-lib-extras-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xine-lib-extras-freeworld.spec 25 Sep 2008 12:35:01 -0000 1.7
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 14:48:17 -0000 1.8
@@ -1,7 +1,7 @@
# TODO:
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.24
+%define abiver 1.25
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
@@ -9,21 +9,26 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.15
-Release: 4%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: xine-lib-1.1.3-optflags.patch
+Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-# External libs
-%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804}
+%if 0%{?_with_external_ffmpeg:1}
+BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
+# HACKS to workaround missing deps in ffmpeg-devel
+# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
+%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -60,9 +65,11 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch6 needed at least when compiling with external ffmpeg, #939.
+# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%patch100 -p1 -b .ffmpeg_api
+
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -109,18 +116,19 @@
rm -rf %{buildroot}%{_libdir}/lib*
rm -rf %{buildroot}%{_libdir}/pkgconfig
+#xineplug_dmx_mpeg
+#xineplug_dmx_mpeg_block
+#xineplug_dmx_mpeg_ts
+#xineplug_dmx_mpeg_elem
+#xineplug_dmx_mpeg_pes
+#xineplug_dmx_yuv4mpeg2
+
# Plugins - credits go to the SuSE RPM maintainer, congrats
cat > plugins << EOF
#
# libmad and MPEG related plugins
xineplug_decode_mad
xineplug_decode_mpeg2
-xineplug_dmx_mpeg
-xineplug_dmx_mpeg_block
-xineplug_dmx_mpeg_ts
-xineplug_dmx_mpeg_elem
-xineplug_dmx_mpeg_pes
-xineplug_dmx_yuv4mpeg2
xineplug_inp_vcd
xineplug_inp_vcdo
#
@@ -177,6 +185,12 @@
%changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16
+
+* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
+- ffmpeg bits_per_sample patch
+
* Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-4
- Obsoletes: xine-lib-moles < 1.1.15-2
15 years, 10 months
rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.16-ffmpeg_api.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xine-lib-extras-freeworld.spec, 1.15, 1.16 xine-lib-1.1.15-ffmpeg-api.patch, 1.2, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21000
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-ffmpeg_api.patch
Removed Files:
xine-lib-1.1.15-ffmpeg-api.patch
Log Message:
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
xine-lib-1.1.16-ffmpeg_api.patch:
--- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch ---
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600
@@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_
* bits/sample for some codecs (e.g. MS ADPCM) */
this->audio_bits = 16;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->audio_bits;
+#else
+ this->context->bits_per_coded_sample = this->audio_bits;
+#endif
this->context->sample_rate = this->audio_sample_rate;
this->context->channels = this->audio_channels;
this->context->codec_id = this->codec->id;
@@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_
&decode_buffer_size,
&this->buf[0],
this->size);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->audio_bits = this->context->bits_per_sample;
+#else
+ this->audio_bits = this->context->bits_per_coded_sample;
+#endif
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels)
diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600
+++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600
@@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_
this->context->extradata_size);
}
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
this->context->bits_per_sample = this->bih.biBitCount;
+#else
+ this->context->bits_per_coded_sample = this->bih.biBitCount;
+#endif
} else {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 22 Aug 2008 18:13:13 -0000 1.3
+++ .cvsignore 7 Jan 2009 20:21:15 -0000 1.4
@@ -1 +1 @@
-xine-lib-1.1.15.tar.bz2
+xine-lib-1.1.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 22 Aug 2008 18:13:13 -0000 1.3
+++ sources 7 Jan 2009 20:21:15 -0000 1.4
@@ -1 +1 @@
-42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2
+acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xine-lib-extras-freeworld.spec 21 Dec 2008 11:05:57 -0000 1.15
+++ xine-lib-extras-freeworld.spec 7 Jan 2009 20:21:15 -0000 1.16
@@ -1,7 +1,7 @@
# TODO:
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.24
+%define abiver 1.25
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
@@ -9,8 +9,8 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.15
-Release: 5%{?dist}
+Version: 1.1.16
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,7 +19,7 @@
Patch0: xine-lib-1.1.3-optflags.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
-Patch100: xine-lib-1.1.15-ffmpeg-api.patch
+Patch100: xine-lib-1.1.16-ffmpeg_api.patch
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@@ -67,7 +67,7 @@
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
-# ffmpeg api
+
%patch100 -p1 -b .ffmpeg_api
# Avoid standard rpaths on lib64 archs:
@@ -116,18 +116,19 @@
rm -rf %{buildroot}%{_libdir}/lib*
rm -rf %{buildroot}%{_libdir}/pkgconfig
+#xineplug_dmx_mpeg
+#xineplug_dmx_mpeg_block
+#xineplug_dmx_mpeg_ts
+#xineplug_dmx_mpeg_elem
+#xineplug_dmx_mpeg_pes
+#xineplug_dmx_yuv4mpeg2
+
# Plugins - credits go to the SuSE RPM maintainer, congrats
cat > plugins << EOF
#
# libmad and MPEG related plugins
xineplug_decode_mad
xineplug_decode_mpeg2
-xineplug_dmx_mpeg
-xineplug_dmx_mpeg_block
-xineplug_dmx_mpeg_ts
-xineplug_dmx_mpeg_elem
-xineplug_dmx_mpeg_pes
-xineplug_dmx_yuv4mpeg2
xineplug_inp_vcd
xineplug_inp_vcdo
#
@@ -184,6 +185,9 @@
%changelog
+* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
+- xine-lib-1.1.16
+
* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.15-5
- ffmpeg bits_per_sample patch
--- xine-lib-1.1.15-ffmpeg-api.patch DELETED ---
15 years, 10 months