[SCM] gmtk/master: Drop patches form upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Thu Jun 12 16:16:51 UTC 2014
The following commit has been merged in the master branch:
commit 16c22ef79b661fa16d1a5eca3697638ad163c320
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Thu Jun 12 17:52:47 2014 +0200
Drop patches form upstream
diff --git a/debian/patches/input.conf-error.patch b/debian/patches/input.conf-error.patch
deleted file mode 100644
index 0be8691..0000000
--- a/debian/patches/input.conf-error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: gmtk_media_player - exclude input.conf from file not found message
-Origin: upstream,
- https://code.google.com/p/gmtk/source/detail?r=213
-Last-Update: 2013-05-26
-
---- a/src/gmtk_media_player.c
-+++ b/src/gmtk_media_player.c
-@@ -3056,6 +3056,7 @@
-
- if (strstr(mplayer_output->str, "Failed to open") != NULL) {
- if (strstr(mplayer_output->str, "LIRC") == NULL &&
-+ strstr(mplayer_output->str, "input.conf") == NULL &&
- strstr(mplayer_output->str, "/dev/rtc") == NULL &&
- strstr(mplayer_output->str, "VDPAU") == NULL && strstr(mplayer_output->str, "registry file") == NULL) {
- if (strstr(mplayer_output->str, "<") == NULL && strstr(mplayer_output->str, ">") == NULL
diff --git a/debian/patches/locale-agnostic.patch b/debian/patches/locale-agnostic.patch
deleted file mode 100644
index b1c98d9..0000000
--- a/debian/patches/locale-agnostic.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Description: Pass floats to mplayer in a locale agnostic way
-Origin: upstream,
- https://code.google.com/p/gmtk/source/detail?r=217
-Last-Update: 2013-05-26
-
---- a/src/gmtk_media_player.c
-+++ b/src/gmtk_media_player.c
-@@ -1347,6 +1347,7 @@
- GmtkMediaPlayerMediaAttributes attribute, gdouble value)
- {
- gchar *cmd;
-+ gchar *tmp;
-
- switch (attribute) {
- case ATTRIBUTE_CACHE_SIZE:
-@@ -1373,9 +1374,16 @@
- player->speed_multiplier = CLAMP(value, 0.1, 10.0);
- if (player->player_state == PLAYER_STATE_RUNNING) {
- if (player->speed_multiplier == 1.0) {
-- cmd = g_strdup_printf("speed_set %f\n", player->speed_multiplier);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->speed_multiplier);
-+ cmd = g_strdup_printf("speed_set %s\n", tmp);
-+ g_free(tmp);
-+
- } else {
-- cmd = g_strdup_printf("speed_mult %f\n", player->speed_multiplier);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->speed_multiplier);
-+ cmd = g_strdup_printf("speed_mult %s\n", tmp);
-+ g_free(tmp);
- }
- write_to_mplayer(player, cmd);
- g_free(cmd);
-@@ -1387,7 +1395,10 @@
- case ATTRIBUTE_SPEED_SET:
- player->speed = CLAMP(value, 0.1, 10.0);
- if (player->player_state == PLAYER_STATE_RUNNING) {
-- cmd = g_strdup_printf("speed_set %f\n", player->speed);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->speed);
-+ cmd = g_strdup_printf("speed_set %s\n", tmp);
-+ g_free(tmp);
- write_to_mplayer(player, cmd);
- g_free(cmd);
- cmd = NULL;
-@@ -1398,7 +1409,11 @@
- case ATTRIBUTE_SUBTITLE_SCALE:
- player->subtitle_scale = CLAMP(value, 0.2, 100.0);
- if (player->player_state == PLAYER_STATE_RUNNING) {
-- cmd = g_strdup_printf("sub_scale %f 1\n", player->subtitle_scale);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->subtitle_scale);
-+ cmd = g_strdup_printf("sub_scale %s\n", tmp);
-+ g_free(tmp);
-+
- write_to_mplayer(player, cmd);
- g_free(cmd);
- cmd = NULL;
-@@ -1408,7 +1423,10 @@
- case ATTRIBUTE_SUBTITLE_DELAY:
- player->subtitle_delay = value;
- if (player->player_state == PLAYER_STATE_RUNNING) {
-- cmd = g_strdup_printf("set_property sub_delay %f 1\n", player->subtitle_delay);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->subtitle_delay);
-+ cmd = g_strdup_printf("set_property sub_delay %s\n", tmp);
-+ g_free(tmp);
- write_to_mplayer(player, cmd);
- g_free(cmd);
- cmd = NULL;
-@@ -1418,7 +1436,10 @@
- case ATTRIBUTE_AUDIO_DELAY:
- player->audio_delay = CLAMP(value, -100.0, 100.0);
- if (player->player_state == PLAYER_STATE_RUNNING) {
-- cmd = g_strdup_printf("set_property audio_delay %f 1\n", player->audio_delay);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->audio_delay);
-+ cmd = g_strdup_printf("set_property audio_delay %s\n", tmp);
-+ g_free(tmp);
- write_to_mplayer(player, cmd);
- g_free(cmd);
- cmd = NULL;
-@@ -2482,12 +2503,18 @@
-
- if ((gint) (player->start_time) > 0) {
- argv[argn++] = g_strdup_printf("-ss");
-- argv[argn++] = g_strdup_printf("%f", player->start_time);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->start_time);
-+ argv[argn++] = g_strdup(tmp);
-+ g_free(tmp);
- }
-
- if ((gint) (player->run_time) > 0) {
- argv[argn++] = g_strdup_printf("-endpos");
-- argv[argn++] = g_strdup_printf("%f", player->run_time);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->run_time);
-+ argv[argn++] = g_strdup(tmp);
-+ g_free(tmp);
- }
-
- if (player->frame_drop)
-@@ -2500,10 +2527,16 @@
- argv[argn++] = g_strdup_printf("%i", player->osdlevel);
-
- argv[argn++] = g_strdup_printf("-delay");
-- argv[argn++] = g_strdup_printf("%f", player->audio_delay);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->audio_delay);
-+ argv[argn++] = g_strdup(tmp);
-+ g_free(tmp);
-
- argv[argn++] = g_strdup_printf("-subdelay");
-- argv[argn++] = g_strdup_printf("%f", player->subtitle_delay);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->subtitle_delay);
-+ argv[argn++] = g_strdup(tmp);
-+ g_free(tmp);
-
- argv[argn++] = g_strdup_printf("-subpos");
- argv[argn++] = g_strdup_printf("%i", player->subtitle_position);
-@@ -2597,7 +2630,10 @@
- }
-
- argv[argn++] = g_strdup_printf("-ass-font-scale");
-- argv[argn++] = g_strdup_printf("%1.2f", player->subtitle_scale);
-+ tmp = g_new0(char, G_ASCII_DTOSTR_BUF_SIZE);
-+ tmp = g_ascii_dtostr(tmp, G_ASCII_DTOSTR_BUF_SIZE, player->subtitle_scale);
-+ argv[argn++] = g_strdup(tmp);
-+ g_free(tmp);
-
- if (player->subtitle_color != NULL && strlen(player->subtitle_color) > 0) {
- argv[argn++] = g_strdup_printf("-ass-color");
diff --git a/debian/patches/series b/debian/patches/series
index e7d1a0a..01bdf0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0002-hide-private-symbols.patch
0003-use-soname-as-domain.patch
metadata-handling.patch
-input.conf-error.patch
-locale-agnostic.patch
--
gmtk packaging
More information about the pkg-multimedia-commits
mailing list