Date: Tuesday, November 1, 2016 @ 20:51:19 Author: heftig Revision: 279660
1.10.0-1 Modified: gst-plugins-good/trunk/PKGBUILD Deleted: gst-plugins-good/trunk/0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch gst-plugins-good/trunk/0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch -----------------------------------------------------------+ 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch | 91 - 0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch | 550 ------------ PKGBUILD | 15 3 files changed, 4 insertions(+), 652 deletions(-) Deleted: 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch =================================================================== --- 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch 2016-11-01 20:49:44 UTC (rev 279659) +++ 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch 2016-11-01 20:51:19 UTC (rev 279660) @@ -1,91 +0,0 @@ -From 944e86db955fa48137a1ac6ee593f2d23681c8f6 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Sun, 9 Oct 2016 15:23:51 +0200 -Subject: [PATCH] tests: Fix level test in CK_FORK=no mode - -The tests accumulate buffers in GstCheck's buffers list, and the list is -not (consistently) reset between tests. Do that and remove the now -conflicting unrefs for outbuffers. ---- - tests/check/elements/level.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/tests/check/elements/level.c b/tests/check/elements/level.c -index f05370f0ff72709a..b17ea167f42b3291 100644 ---- a/tests/check/elements/level.c -+++ b/tests/check/elements/level.c -@@ -96,6 +96,7 @@ cleanup_level (GstElement * level) - { - GST_DEBUG ("cleanup_level"); - -+ gst_check_drop_buffers (); - gst_pad_set_active (mysrcpad, FALSE); - gst_pad_set_active (mysinkpad, FALSE); - gst_check_teardown_src_pad (level); -@@ -194,7 +195,6 @@ GST_START_TEST (test_ref_counts) - gst_element_set_bus (level, NULL); - ASSERT_OBJECT_REFCOUNT (bus, "bus", 1); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - fail_unless (gst_element_set_state (level, - GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null"); - ASSERT_OBJECT_REFCOUNT (level, "level", 1); -@@ -241,7 +241,6 @@ GST_START_TEST (test_message_is_valid) - gst_object_unref (bus); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); -- gst_check_drop_buffers (); - } - - GST_END_TEST; -@@ -298,7 +297,6 @@ GST_START_TEST (test_int16) - gst_message_unref (message); - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } -@@ -377,7 +375,6 @@ GST_START_TEST (test_int16_panned) - gst_bus_set_flushing (bus, TRUE); - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } -@@ -436,7 +433,6 @@ GST_START_TEST (test_float) - gst_message_unref (message); - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } -@@ -503,7 +499,6 @@ GST_START_TEST (test_message_on_eos) - gst_message_unref (message); - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } -@@ -543,7 +538,6 @@ GST_START_TEST (test_message_count) - - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } -@@ -591,7 +585,6 @@ GST_START_TEST (test_message_timestamps) - - gst_element_set_bus (level, NULL); - gst_object_unref (bus); -- gst_buffer_unref (outbuffer); - gst_element_set_state (level, GST_STATE_NULL); - cleanup_level (level); - } --- -2.10.0 - Deleted: 0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch =================================================================== --- 0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch 2016-11-01 20:49:44 UTC (rev 279659) +++ 0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch 2016-11-01 20:51:19 UTC (rev 279660) @@ -1,550 +0,0 @@ -From c896febe90fa6f7b39711db1a82989f7c90257e1 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Sun, 9 Oct 2016 16:56:10 +0200 -Subject: [PATCH] tests: Fix souphttpsrc tests without CK_FORK=no - -It seems that the forked processes all attempt to handle the listening -socket from the server, and only one has to shutdown the socket to break -the server completely. - -Create a new server inside each test to avoid this. ---- - tests/check/elements/souphttpsrc.c | 302 +++++++++++++++---------------------- - 1 file changed, 122 insertions(+), 180 deletions(-) - -diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c -index 03f4d4017c130836..5cef740fa6e34b4a 100644 ---- a/tests/check/elements/souphttpsrc.c -+++ b/tests/check/elements/souphttpsrc.c -@@ -36,7 +36,6 @@ - #define SoupStatus SoupKnownStatusCode - #endif - --static guint http_port = 0, https_port = 0; - - gboolean redirect = TRUE; - -@@ -53,8 +52,8 @@ static const char *realm = "SOUPHTTPSRC_REALM"; - static const char *basic_auth_path = "/basic_auth"; - static const char *digest_auth_path = "/digest_auth"; - --static gboolean run_server (guint * http_port, guint * https_port); --static void stop_server (void); -+static guint get_port_from_server (SoupServer * server); -+static SoupServer * run_server (gboolean use_https); - - static void - handoff_cb (GstElement * fakesink, GstBuffer * buf, GstPad * pad, -@@ -85,22 +84,25 @@ digest_auth_cb (SoupAuthDomain * domain, SoupMessage * msg, - return NULL; - } - --static int --run_test (const char *format, ...) -+static gboolean -+run_test (gboolean use_https, const gchar *path, gint expected) - { - GstStateChangeReturn ret; -- - GstElement *pipe, *src, *sink; -- - GstBuffer *buf = NULL; -- - GstMessage *msg; -- - gchar *url; -+ gboolean res = FALSE; -+ SoupServer *server; -+ guint port; - -- va_list args; -- -- int rc = -1; -+ server = run_server (use_https); -+ if (server == NULL) { -+ g_print ("Failed to start up %s server", -+ use_https ? "HTTPS" : "HTTP"); -+ /* skip this test */ -+ return TRUE; -+ } - - pipe = gst_pipeline_new (NULL); - -@@ -114,13 +116,9 @@ run_test (const char *format, ...) - gst_bin_add (GST_BIN (pipe), sink); - fail_unless (gst_element_link (src, sink)); - -- if (http_port == 0) { -- GST_DEBUG ("failed to start soup http server"); -- } -- fail_unless (http_port != 0); -- va_start (args, format); -- g_vasprintf (&url, format, args); -- va_end (args); -+ port = get_port_from_server (server); -+ url = g_strdup_printf ("%s://127.0.0.1:%u%s", -+ use_https ? "https" : "http", port, path); - fail_unless (url != NULL); - g_object_set (src, "location", url, NULL); - g_free (url); -@@ -148,8 +146,8 @@ run_test (const char *format, ...) - GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1); - if (GST_MESSAGE_TYPE (msg) == GST_MESSAGE_ERROR) { - gchar *debug = NULL; -- - GError *err = NULL; -+ gint rc = -1; - - gst_message_parse_error (msg, &err, &debug); - GST_INFO ("error: %s", err->message); -@@ -170,6 +168,8 @@ run_test (const char *format, ...) - g_error_free (err); - g_free (debug); - gst_message_unref (msg); -+ GST_DEBUG ("Got HTTP error %u, expected %u", rc, expected); -+ res = (rc == expected); - goto done; - } - gst_message_unref (msg); -@@ -183,6 +183,7 @@ run_test (const char *format, ...) - * it might be for lots of reasons (no network connection, whatever), we're - * not interested in those */ - GST_DEBUG ("didn't manage to get data within 10 seconds, skipping test"); -+ res = TRUE; - goto done; - } - -@@ -191,34 +192,34 @@ run_test (const char *format, ...) - /* first buffer should have a 0 offset */ - fail_unless (GST_BUFFER_OFFSET (buf) == 0); - gst_buffer_unref (buf); -- rc = 0; -+ res = (expected == 0); - - done: - - gst_element_set_state (pipe, GST_STATE_NULL); - gst_object_unref (pipe); -- return rc; -+ gst_object_unref (server); -+ return res; - } - - GST_START_TEST (test_first_buffer_has_offset) - { -- fail_unless (run_test ("http://127.0.0.1:%u/";, http_port) == 0); -+ fail_unless (run_test (FALSE, "/", 0)); - } - - GST_END_TEST; - - GST_START_TEST (test_not_found) - { -- fail_unless (run_test ("http://127.0.0.1:%u/404";, http_port) == 404); -- fail_unless (run_test ("http://127.0.0.1:%u/404-with-data";, -- http_port) == 404); -+ fail_unless (run_test (FALSE, "/404", 404)); -+ fail_unless (run_test (FALSE, "/404-with-data", 404)); - } - - GST_END_TEST; - - GST_START_TEST (test_forbidden) - { -- fail_unless (run_test ("http://127.0.0.1:%u/403";, http_port) == 403); -+ fail_unless (run_test (FALSE, "/403", 403)); - } - - GST_END_TEST; -@@ -226,7 +227,7 @@ GST_END_TEST; - GST_START_TEST (test_redirect_no) - { - redirect = FALSE; -- fail_unless (run_test ("http://127.0.0.1:%u/302";, http_port) == 302); -+ fail_unless (run_test (FALSE, "/302", 302)); - } - - GST_END_TEST; -@@ -234,17 +235,14 @@ GST_END_TEST; - GST_START_TEST (test_redirect_yes) - { - redirect = TRUE; -- fail_unless (run_test ("http://127.0.0.1:%u/302";, http_port) == 0); -+ fail_unless (run_test (FALSE, "/302", 0)); - } - - GST_END_TEST; - - GST_START_TEST (test_https) - { -- if (!https_port) -- GST_INFO ("Failed to start an HTTPS server; let's just skip this test."); -- else -- fail_unless (run_test ("https://127.0.0.1:%u/";, https_port) == 0); -+ fail_unless (run_test (TRUE, "/", 0)); - } - - GST_END_TEST; -@@ -252,96 +250,96 @@ GST_END_TEST; - GST_START_TEST (test_cookies) - { - static const char *biscotti[] = { "delacre=yummie", "koekje=lu", NULL }; -- int rc; -+ gboolean res; - - cookies = biscotti; -- rc = run_test ("http://127.0.0.1:%u/";, http_port); -+ res = run_test (FALSE, "/", 0); - cookies = NULL; -- fail_unless (rc == 0); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_good_user_basic_auth) - { -- int res; -+ gboolean res; - - user_id = good_user; - user_pw = good_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, basic_auth_path); -+ res = run_test (FALSE, basic_auth_path, 0); - GST_DEBUG ("Basic Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 0); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_bad_user_basic_auth) - { -- int res; -+ gboolean res; - - user_id = bad_user; - user_pw = good_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, basic_auth_path); -+ res = run_test (FALSE, basic_auth_path, 401); - GST_DEBUG ("Basic Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 401); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_bad_password_basic_auth) - { -- int res; -+ gboolean res; - - user_id = good_user; - user_pw = bad_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, basic_auth_path); -+ res = run_test (FALSE, basic_auth_path, 401); - GST_DEBUG ("Basic Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 401); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_good_user_digest_auth) - { -- int res; -+ gboolean res; - - user_id = good_user; - user_pw = good_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, digest_auth_path); -+ res = run_test (FALSE, digest_auth_path, 0); - GST_DEBUG ("Digest Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 0); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_bad_user_digest_auth) - { -- int res; -+ gboolean res; - - user_id = bad_user; - user_pw = good_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, digest_auth_path); -+ res = run_test (FALSE, digest_auth_path, 401); - GST_DEBUG ("Digest Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 401); -+ fail_unless (res); - } - - GST_END_TEST; - - GST_START_TEST (test_bad_password_digest_auth) - { -- int res; -+ gboolean res; - - user_id = good_user; - user_pw = bad_pw; -- res = run_test ("http://127.0.0.1:%u%s";, http_port, digest_auth_path); -+ res = run_test (FALSE, digest_auth_path, 401); - GST_DEBUG ("Digest Auth user %s password %s res = %d", user_id, user_pw, res); - user_id = user_pw = NULL; -- fail_unless (res == 401); -+ fail_unless (res); - } - - GST_END_TEST; -@@ -424,9 +422,6 @@ GST_START_TEST (test_icy_stream) - - GST_END_TEST; - --static SoupServer *server; /* NULL */ --static SoupServer *ssl_server; /* NULL */ -- - static Suite * - souphttpsrc_suite (void) - { -@@ -443,27 +438,19 @@ souphttpsrc_suite (void) - tc_internet = tcase_create ("internet"); - - suite_add_tcase (s, tc_chain); -- if (run_server (&http_port, &https_port)) { -- atexit (stop_server); -- tcase_add_test (tc_chain, test_first_buffer_has_offset); -- tcase_add_test (tc_chain, test_redirect_yes); -- tcase_add_test (tc_chain, test_redirect_no); -- tcase_add_test (tc_chain, test_not_found); -- tcase_add_test (tc_chain, test_forbidden); -- tcase_add_test (tc_chain, test_cookies); -- tcase_add_test (tc_chain, test_good_user_basic_auth); -- tcase_add_test (tc_chain, test_bad_user_basic_auth); -- tcase_add_test (tc_chain, test_bad_password_basic_auth); -- tcase_add_test (tc_chain, test_good_user_digest_auth); -- tcase_add_test (tc_chain, test_bad_user_digest_auth); -- tcase_add_test (tc_chain, test_bad_password_digest_auth); -- -- if (ssl_server != NULL) -- tcase_add_test (tc_chain, test_https); -- } else { -- g_print ("Skipping 12 souphttpsrc tests, couldn't start or connect to " -- "local http server\n"); -- } -+ tcase_add_test (tc_chain, test_first_buffer_has_offset); -+ tcase_add_test (tc_chain, test_redirect_yes); -+ tcase_add_test (tc_chain, test_redirect_no); -+ tcase_add_test (tc_chain, test_not_found); -+ tcase_add_test (tc_chain, test_forbidden); -+ tcase_add_test (tc_chain, test_cookies); -+ tcase_add_test (tc_chain, test_good_user_basic_auth); -+ tcase_add_test (tc_chain, test_bad_user_basic_auth); -+ tcase_add_test (tc_chain, test_bad_password_basic_auth); -+ tcase_add_test (tc_chain, test_good_user_digest_auth); -+ tcase_add_test (tc_chain, test_bad_user_digest_auth); -+ tcase_add_test (tc_chain, test_bad_password_digest_auth); -+ tcase_add_test (tc_chain, test_https); - - suite_add_tcase (s, tc_internet); - tcase_set_timeout (tc_internet, 250); -@@ -577,84 +564,70 @@ get_port_from_server (SoupServer * server) - return port; - } - --static gboolean --run_server (guint * http_port, guint * https_port) -+static SoupServer * -+run_server (gboolean use_https) - { -- guint port = SOUP_ADDRESS_ANY_PORT; -- guint ssl_port = SOUP_ADDRESS_ANY_PORT; -- const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem"; -- const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem"; -- static int server_running = 0; -- GSocketAddress *address; -- GError *err = NULL; -+ SoupServer *server; -+ SoupServerListenOptions listen_flags; -+ guint port; - -- SoupAuthDomain *domain = NULL; - -- if (server_running) -- return TRUE; -- -- server_running = 1; -- -- *http_port = *https_port = 0; -- -- server = soup_server_new (NULL, NULL); -- if (!server) { -- GST_DEBUG ("Unable to create server"); -- return FALSE; -- } -- soup_server_add_handler (server, NULL, server_callback, NULL, NULL); -- domain = soup_auth_domain_basic_new (SOUP_AUTH_DOMAIN_REALM, realm, -- SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, basic_auth_cb, -- SOUP_AUTH_DOMAIN_ADD_PATH, basic_auth_path, NULL); -- soup_server_add_auth_domain (server, domain); -- g_object_unref (domain); -- domain = soup_auth_domain_digest_new (SOUP_AUTH_DOMAIN_REALM, realm, -- SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK, digest_auth_cb, -- SOUP_AUTH_DOMAIN_ADD_PATH, digest_auth_path, NULL); -- soup_server_add_auth_domain (server, domain); -- g_object_unref (domain); -- -- address = g_inet_socket_address_new_from_string ("0.0.0.0", port); -- soup_server_listen (server, address, 0, &err); -- g_object_unref (address); -- if (err) { -- stop_server (); -- g_clear_error (&err); -- return FALSE; -- } -- -- *http_port = get_port_from_server (server); -- GST_DEBUG ("HTTP server listening on port %u", *http_port); -- -- if (ssl_cert_file && ssl_key_file) { -+ if (use_https) { -+ const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem"; -+ const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem"; - GTlsBackend *backend = g_tls_backend_get_default (); - -- if (backend != NULL && g_tls_backend_supports_tls (backend)) { -- ssl_server = soup_server_new (SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file, -- SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL); -- } else { -+ if (backend == NULL || !g_tls_backend_supports_tls (backend)) { - GST_INFO ("No TLS support"); -+ return NULL; - } - -- if (ssl_server) { -- GST_INFO ("HTTPS server listening on port %u", *https_port); -- soup_server_add_handler (ssl_server, NULL, server_callback, NULL, NULL); -- address = g_inet_socket_address_new_from_string ("0.0.0.0", ssl_port); -- soup_server_listen (ssl_server, address, SOUP_SERVER_LISTEN_HTTPS, &err); -- g_object_unref (address); -+ server = soup_server_new (SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file, -+ SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL); -+ listen_flags = SOUP_SERVER_LISTEN_HTTPS; -+ } else { -+ server = soup_server_new (NULL, NULL); -+ listen_flags = 0; -+ } - -- if (err) { -- GST_ERROR ("Failed to start HTTPS server: %s", err->message); -- stop_server (); -- g_clear_error (&err); -- return FALSE; -- } -+ soup_server_add_handler (server, NULL, server_callback, NULL, NULL); - -- *https_port = get_port_from_server (ssl_server); -- GST_DEBUG ("HTTPS server listening on port %u", *https_port); -+ { -+ SoupAuthDomain *domain; -+ -+ domain = soup_auth_domain_basic_new (SOUP_AUTH_DOMAIN_REALM, realm, -+ SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK, basic_auth_cb, -+ SOUP_AUTH_DOMAIN_ADD_PATH, basic_auth_path, NULL); -+ soup_server_add_auth_domain (server, domain); -+ g_object_unref (domain); -+ -+ domain = soup_auth_domain_digest_new (SOUP_AUTH_DOMAIN_REALM, realm, -+ SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK, digest_auth_cb, -+ SOUP_AUTH_DOMAIN_ADD_PATH, digest_auth_path, NULL); -+ soup_server_add_auth_domain (server, domain); -+ g_object_unref (domain); -+ } -+ -+ { -+ GSocketAddress *address; -+ GError *err = NULL; -+ -+ address = g_inet_socket_address_new_from_string ("0.0.0.0", SOUP_ADDRESS_ANY_PORT); -+ soup_server_listen (server, address, listen_flags, &err); -+ g_object_unref (address); -+ -+ if (err) { -+ GST_ERROR ("Failed to start %s server: %s", -+ use_https ? "HTTPS" : "HTTP", err->message); -+ g_object_unref (server); -+ g_error_free (err); -+ return NULL; - } - } - -+ port = get_port_from_server (server); -+ GST_DEBUG ("%s server listening on port %u", use_https ? "HTTPS" : "HTTP", port); -+ - /* check if we can connect to our local http server */ - { - GSocketConnection *conn; -@@ -662,48 +635,17 @@ run_server (guint * http_port, guint * https_port) - - client = g_socket_client_new (); - g_socket_client_set_timeout (client, 2); -- conn = g_socket_client_connect_to_host (client, "127.0.0.1", *http_port, -- NULL, NULL); -+ conn = g_socket_client_connect_to_host (client, "127.0.0.1", port, NULL, NULL); - if (conn == NULL) { -- GST_INFO ("Couldn't connect to http server 127.0.0.1:%u", *http_port); -+ GST_INFO ("Couldn't connect to 127.0.0.1:%u", port); - g_object_unref (client); -- stop_server (); -- return FALSE; -+ g_object_unref (server); -+ return NULL; - } -+ - g_object_unref (conn); -- -- if (ssl_server == NULL) -- goto skip_https_check; -- -- conn = g_socket_client_connect_to_host (client, "127.0.0.1", *https_port, -- NULL, NULL); -- if (conn == NULL) { -- GST_INFO ("Couldn't connect to https server 127.0.0.1:%u", *https_port); -- g_object_unref (client); -- stop_server (); -- return FALSE; -- } -- g_object_unref (conn); -- -- skip_https_check: -- - g_object_unref (client); - } - -- return TRUE; --} -- --static void --stop_server (void) --{ -- GST_INFO ("cleaning up"); -- -- if (server) { -- g_object_unref (server); -- server = NULL; -- } -- if (ssl_server) { -- g_object_unref (ssl_server); -- ssl_server = NULL; -- } -+ return server; - } --- -2.10.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-01 20:49:44 UTC (rev 279659) +++ PKGBUILD 2016-11-01 20:51:19 UTC (rev 279660) @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <[email protected]> pkgname=gst-plugins-good -pkgver=1.9.90+8+g6542edd +pkgver=1.10.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="https://gstreamer.freedesktop.org/"; @@ -13,15 +13,11 @@ gdk-pixbuf2 libcaca libavc1394 libiec61883 libxdamage v4l-utils cairo libgudev) makedepends=(gstreamer speex flac libraw1394 python gtk-doc autoconf-archive git) options=(!emptydirs) -_commit=6542edd9098aad98c0ac18f0ba5a4650932e14e1 # master +_commit=990eeb22ba8f8cce9be184abd9c9cd6b30f893e4 # tags/1.10.0^0 source=("git://anongit.freedesktop.org/gstreamer/gst-plugins-good#commit=$_commit" - "gst-common::git://anongit.freedesktop.org/gstreamer/common" - 0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch - 0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch) + "gst-common::git://anongit.freedesktop.org/gstreamer/common") sha256sums=('SKIP' - 'SKIP' - 'bff7a50820ddd3696c8a3bdb2e556c74aaf2eeac3be633801544cb4a48b5eeca' - '0368969f01af89573d9bf4094f4facf6d35688efd880d835a9891677625b0c85') + 'SKIP') pkgver() { cd $pkgname @@ -31,9 +27,6 @@ prepare() { cd $pkgname - patch -Np1 -i ../0001-tests-Fix-level-test-in-CK_FORK-no-mode.patch - patch -Np1 -i ../0001-tests-Fix-souphttpsrc-tests-without-CK_FORK-no.patch - git submodule init git config --local submodule.common.url "$srcdir/gst-common" git submodule update
