commit f2bf15a20ca6f3428234b82c4667dfcdab9ae86a · pyrox.dev/nixpkgs

+95

pkgs/development/libraries/dleyna-core/0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch

···

       1
       1
       +
       From bf549a028a5da122b7a4206529711b969c2ecd48 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jan Tojnar <jtojnar@gmail.com>

     

       3
       3
       +
       Date: Fri, 1 Sep 2017 13:49:06 +0200

     

       4
       4
       +
       Subject: [PATCH] Search connectors in DLEYNA_CONNECTOR_PATH

     

       5
       5
       +
       

     

       6
       6
       +
       Previously, the connectors would only be looked for in a single

     

       7
       7
       +
       directory, specified during compilation. This patch allows to

     

       8
       8
       +
       traverse a list of directories provided by an environment variable.

     

       9
       9
       +
       ---

     

       10
       10
       +
        libdleyna/core/connector-mgr.c | 63 ++++++++++++++++++++++++++++--------------

     

       11
       11
       +
        1 file changed, 42 insertions(+), 21 deletions(-)

     

       12
       12
       +
       

     

       13
       13
       +
       diff --git a/libdleyna/core/connector-mgr.c b/libdleyna/core/connector-mgr.c

     

       14
       14
       +
       index eafb16c..8041c67 100644

     

       15
       15
       +
       --- a/libdleyna/core/connector-mgr.c

     

       16
       16
       +
       +++ b/libdleyna/core/connector-mgr.c

     

       17
       17
       +
       @@ -34,33 +34,54 @@ const dleyna_connector_t *dleyna_connector_mgr_load(const gchar *name)

     

       18
       18
       +
        	const dleyna_connector_t *connector;

     

       19
       19
       +
        	dleyna_connector_get_interface_t get_interface;

     

       20
       20
       +
        	gchar *path;

     

       21
       21
       +
       +	const gchar *connector_path;

     

       22
       22
       +
       +	gchar **connector_path_list;

     

       23
       23
       +
       +	gsize i;

     

       24
       24
       +
        

     

       25
       25
       +
        	DLEYNA_LOG_DEBUG("Enter");

     

       26
       26
       +
        

     

       27
       27
       +
       -	path = g_strdup_printf("%s/%s%s.so", CONNECTOR_DIR,

     

       28
       28
       +
       -			       DLEYNA_CONNECTOR_LIB_PATTERN, name);

     

       29
       29
       +
       -	module = g_module_open(path, G_MODULE_BIND_LAZY);

     

       30
       30
       +
       -	g_free(path);

     

       31
       31
       +
       +	connector_path = g_getenv ("DLEYNA_CONNECTOR_PATH");

     

       32
       32
       +
       +	if (!connector_path) {

     

       33
       33
       +
       +		DLEYNA_LOG_DEBUG ("DLEYNA_CONNECTOR_PATH not set");

     

       34
       34
       +
       +		connector_path = CONNECTOR_DIR;

     

       35
       35
       +
       +	} else {

     

       36
       36
       +
       +		DLEYNA_LOG_DEBUG ("DLEYNA_CONNECTOR_PATH set to %s", connector_path);

     

       37
       37
       +
       +	}

     

       38
       38
       +
       +

     

       39
       39
       +
       +	connector_path_list = g_strsplit (connector_path, G_SEARCHPATH_SEPARATOR_S, 0);

     

       40
       40
       +
       +

     

       41
       41
       +
       +	for (i = 0; connector_path_list[i]; i++) {

     

       42
       42
       +
       +		path = g_strdup_printf("%s/%s%s.so", connector_path_list[i],

     

       43
       43
       +
       +				       DLEYNA_CONNECTOR_LIB_PATTERN, name);

     

       44
       44
       +
       +		module = g_module_open(path, G_MODULE_BIND_LAZY);

     

       45
       45
       +
       +		g_free(path);

     

       46
       46
       +
       +

     

       47
       47
       +
       +		if (module) {

     

       48
       48
       +
       +			if (!g_connectors)

     

       49
       49
       +
       +				g_connectors = g_hash_table_new(g_direct_hash,

     

       50
       50
       +
       +								g_direct_equal);

     

       51
       51
       +
       +

     

       52
       52
       +
       +			if (g_module_symbol(module, "dleyna_connector_get_interface",

     

       53
       53
       +
       +					    (gpointer *)&get_interface)) {

     

       54
       54
       +
       +				connector = get_interface();

     

       55
       55
       +
       +				g_hash_table_insert(g_connectors, (gpointer)connector,

     

       56
       56
       +
       +						    module);

     

       57
       57
       +
       +

     

       58
       58
       +
       +				break;

     

       59
       59
       +
       +			} else {

     

       60
       60
       +
       +				connector = NULL;

     

       61
       61
       +
       +				g_module_close(module);

     

       62
       62
       +
       +				DLEYNA_LOG_CRITICAL(

     

       63
       63
       +
       +						"Connector '%s' entry point not found",

     

       64
       64
       +
       +						name);

     

       65
       65
       +
       +			}

     

       66
       66
       +
        

     

       67
       67
       +
       -	if (module) {

     

       68
       68
       +
       -		if (!g_connectors)

     

       69
       69
       +
       -			g_connectors = g_hash_table_new(g_direct_hash,

     

       70
       70
       +
       -							g_direct_equal);

     

       71
       71
       +
       -

     

       72
       72
       +
       -		if (g_module_symbol(module, "dleyna_connector_get_interface",

     

       73
       73
       +
       -				    (gpointer *)&get_interface)) {

     

       74
       74
       +
       -			connector = get_interface();

     

       75
       75
       +
       -			g_hash_table_insert(g_connectors, (gpointer)connector,

     

       76
       76
       +
       -					    module);

     

       77
       77
       +
       -		} else {

     

       78
       78
       +
       -			connector = NULL;

     

       79
       79
       +
       -			g_module_close(module);

     

       80
       80
       +
       -			DLEYNA_LOG_CRITICAL(

     

       81
       81
       +
       -					"Connector '%s' entry point not found",

     

       82
       82
       +
       -					name);

     

       83
       83
       +
        		}

     

       84
       84
       +
       +	}

     

       85
       85
       +
        

     

       86
       86
       +
       -	} else {

     

       87
       87
       +
       +	g_strfreev (connector_path_list);

     

       88
       88
       +
       +

     

       89
       89
       +
       +	if (!module) {

     

       90
       90
       +
        		connector = NULL;

     

       91
       91
       +
        		DLEYNA_LOG_CRITICAL("Connector '%s' not found", name);

     

       92
       92
       +
        	}

     

       93
       93
       +
       -- 

     

       94
       94
       +
       2.14.1

     

       95
       95
       +

+28

pkgs/development/libraries/dleyna-core/default.nix

···

       1
       1
       +
       { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "dleyna-core";

     

       5
       5
       +
         version = "0.6.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "01org";

     

       9
       9
       +
           repo = name;

     

       10
       10
       +
           rev = "v${version}";

     

       11
       11
       +
           sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         setupHook = ./setup-hook.sh;

     

       15
       15
       +
       

     

       16
       16
       +
         patches = [ ./0001-Search-connectors-in-DLEYNA_CONNECTOR_PATH.patch ];

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       19
       19
       +
         propagatedBuildInputs = [ gupnp ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with stdenv.lib; {

     

       22
       22
       +
           description = "Library of utility functions that are used by the higher level dLeyna";

     

       23
       23
       +
           homepage = http://01.org/dleyna;

     

       24
       24
       +
           maintainers = [ maintainers.jtojnar ];

     

       25
       25
       +
           platforms = platforms.linux;

     

       26
       26
       +
           license = licenses.lgpl21;

     

       27
       27
       +
         };

     

       28
       28
       +
       }

pkgs/development/libraries/dleyna-core/setup-hook.sh

···

       1
       1
       +
       addDleynaConnectorPath () {

     

       2
       2
       +
           if test -d "$1/lib/dleyna-1.0/connectors"

     

       3
       3
       +
           then

     

       4
       4
       +
               export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors"

     

       5
       5
       +
           fi

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       envHooks+=(addDleynaConnectorPath)

     

       9
       9
       +

pkgs/top-level/all-packages.nix

···

       1749
       1749
        
       

     

       1750
       1750
        
         disper = callPackage ../tools/misc/disper { };

     

       1751
       1751
        
       

     

       1752
       1752
       +
         dleyna-core = callPackage ../development/libraries/dleyna-core { };

     

       1753
       1753
       +
       

     

       1752
       1754
        
         dmd_2_067_1 = callPackage ../development/compilers/dmd/2.067.1.nix {

     

       1753
       1755
        
           stdenv = if stdenv.hostPlatform.isDarwin then

     

       1754
       1756
        
                      stdenv