commit b1db014f4003f84df2777c705b57b26d95160a0e · pyrox.dev/nixpkgs

+10 -3

pkgs/applications/networking/instant-messengers/linphone/default.nix

···

       1
       1
        
       { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp

     

       2
       2
        
       , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev

     

       3
       3
        
       , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip

     

       4
       4
       +
       , mediastreamer-openh264, makeWrapper

     

       4
       5
        
       }:

     

       5
       6
        
       

     

       6
       7
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "linphone-3.8.1";

     

       8
       8
       +
         name = "linphone-3.8.5";

     

       8
       9
        
       

     

       9
       10
        
         src = fetchurl {

     

       10
       11
        
           url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd";

     

       12
       12
       +
           sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax";

     

       12
       13
        
         };

     

       13
       14
        
       

     

       14
       15
        
         buildInputs = [

     
···

       16
       17
        
           polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip

     

       17
       18
        
         ];

     

       18
       19
        
       

     

       19
       19
       -
         nativeBuildInputs = [ intltool pkgconfig ];

     

       20
       20
       +
         nativeBuildInputs = [ intltool pkgconfig makeWrapper ];

     

       20
       21
        
       

     

       21
       22
        
         configureFlags = [

     

       22
       23
        
           "--enable-ldap"

     
···

       26
       27
        
           "--enable-external-ortp"

     

       27
       28
        
           "--enable-external-mediastreamer"

     

       28
       29
        
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         postInstall = ''

     

       32
       32
       +
           for i in $(cd $out/bin && ls); do

     

       33
       33
       +
             wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins

     

       34
       34
       +
           done

     

       35
       35
       +
         '';

     

       29
       36
        
       

     

       30
       37
        
         meta = with stdenv.lib; {

     

       31
       38
        
           homepage = http://www.linphone.org/;

-35

pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch

···

       1
       1
       -
       diff --git a/gtk/main.c b/gtk/main.c

     

       2
       2
       -
       index 7079bc8..f076127 100644

     

       3
       3
       -
       --- a/gtk/main.c

     

       4
       4
       -
       +++ b/gtk/main.c

     

       5
       5
       -
       @@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){

     

       6
       6
       -
        	GdkPixbuf *pbuf;

     

       7
       7
       -
        	const char *app_name="Linphone";

     

       8
       8
       -
        

     

       9
       9
       -
       -	g_thread_init(NULL);

     

       10
       10
       -
       +	g_type_init();

     

       11
       11
       -
        	gdk_threads_init();

     

       12
       12
       -
        	

     

       13
       13
       -
        	progpath = strdup(argv[0]);

     

       14
       14
       -
       diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c

     

       15
       15
       -
       index 1c54fca..45c9091 100644

     

       16
       16
       -
       --- a/gtk/setupwizard.c

     

       17
       17
       -
       +++ b/gtk/setupwizard.c

     

       18
       18
       -
       @@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {

     

       19
       19
       -
        	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));

     

       20
       20
       -
        

     

       21
       21
       -
        	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {

     

       22
       22
       -
       -		g_thread_create(check_username_availability, (void*)w, FALSE, NULL);

     

       23
       23
       -
       +		g_thread_new (NULL, check_username_availability, (void*)w);

     

       24
       24
       -
        	}

     

       25
       25
       -
        	else {

     

       26
       26
       -
        		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {

     

       27
       27
       -
       @@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){

     

       28
       28
       -
        	ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));

     

       29
       29
       -
        	notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));

     

       30
       30
       -
        

     

       31
       31
       -
       -	g_thread_init (NULL);

     

       32
       32
       -
       +	g_type_init ();

     

       33
       33
       -
        	gdk_threads_init ();

     

       34
       34
       -
        

     

       35
       35
       -
        	GtkWidget *p1=create_intro();

+2 -2

pkgs/development/libraries/belle-sip/default.nix

···

       9
       9
        
         };

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
       -
         name = "belle-sip-1.4.0";

     

       12
       12
       +
         name = "belle-sip-1.4.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";

     

       16
       16
       -
           sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";

     

       16
       16
       +
           sha256 = "0q1d3fqsrxi3kxcjcibr376js25h6in8c1hm7c53wz252jx6f42b";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ jre ];

+6 -3

pkgs/development/libraries/mediastreamer/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         name = "mediastreamer-2.11.1";

     

       7
       7
       +
         name = "mediastreamer-2.11.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd";

     

       11
       11
       +
           sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         patches = [ ./plugins_dir.patch ];

     

       15
       15
       +
       

     

       14
       16
        
         postPatch = ''

     

       15
       17
        
           sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure

     

       16
       18
        
         '';

     

       17
       19
        
       

     

       18
       18
       -
         # TODO: make it load plugins from *_PLUGIN_PATH

     

       19
       20
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       20
       21
        
       

     

       21
       22
        
         propagatedBuildInputs = [

     
···

       28
       29
        
         configureFlags = [

     

       29
       30
        
           "--enable-external-ortp"

     

       30
       31
        
           "--with-srtp=${srtp}"

     

       32
       32
       +
           "--enable-xv"

     

       33
       33
       +
           "--enable-glx"

     

       31
       34
        
         ];

     

       32
       35
        
       

     

       33
       36
        
         meta = with stdenv.lib; {

+20

pkgs/development/libraries/mediastreamer/msopenh264.nix

···

       1
       1
       +
       { stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "mediastreamer-openh264-${version}";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz";

     

       9
       9
       +
           sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ];

     

       13
       13
       +
       

     

       14
       14
       +
         meta = with stdenv.lib; {

     

       15
       15
       +
           description = "H.264 encoder/decoder plugin for mediastreamer2";

     

       16
       16
       +
           homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;

     

       17
       17
       +
           license = licenses.gpl2;

     

       18
       18
       +
           platforms = platforms.linux;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+24

pkgs/development/libraries/mediastreamer/plugins_dir.patch

···

       1
       1
       +
       diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c

     

       2
       2
       +
       --- a/src/base/msfactory.c	2015-05-13 16:53:49.801113249 +0200

     

       3
       3
       +
       +++ b/src/base/msfactory.c	2015-08-26 21:35:44.994724647 +0200

     

       4
       4
       +
       @@ -630,12 +630,18 @@

     

       5
       5
       +
        }

     

       6
       6
       +
        

     

       7
       7
       +
        void ms_factory_init_plugins(MSFactory *obj) {

     

       8
       8
       +
       +	char *package_plugins_dir;

     

       9
       9
       +
        	if (obj->plugins_dir == NULL) {

     

       10
       10
       +
       +		package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");

     

       11
       11
       +
       +		if (package_plugins_dir!=NULL){

     

       12
       12
       +
       +			obj->plugins_dir = ms_strdup(package_plugins_dir);

     

       13
       13
       +
       +		} else {

     

       14
       14
       +
        #ifdef PACKAGE_PLUGINS_DIR

     

       15
       15
       +
       -		obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);

     

       16
       16
       +
       +			obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);

     

       17
       17
       +
        #else

     

       18
       18
       +
       -		obj->plugins_dir = ms_strdup("");

     

       19
       19
       +
       +			obj->plugins_dir = ms_strdup("");

     

       20
       20
       +
        #endif

     

       21
       21
       +
       +		}

     

       22
       22
       +
        	}

     

       23
       23
       +
        	if (strlen(obj->plugins_dir) > 0) {

     

       24
       24
       +
        		ms_message("Loading ms plugins from [%s]",obj->plugins_dir);

+22

pkgs/development/libraries/openh264/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, nasm }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "openh264-1.4.0";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";

     

       8
       8
       +
           sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         buildInputs = [ nasm ];

     

       12
       12
       +
       

     

       13
       13
       +
         installPhase = ''

     

       14
       14
       +
           make PREFIX=$out install

     

       15
       15
       +
         '';

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with stdenv.lib; {

     

       18
       18
       +
           description = "A codec library which supports H.264 encoding and decoding";

     

       19
       19
       +
           homepage = http://www.openh264.org;

     

       20
       20
       +
           license = stdenv.lib.licenses.bsd2;

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+2 -2

pkgs/development/libraries/ortp/default.nix

···

       1
       1
        
       { stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "ortp-0.24.1";

     

       4
       4
       +
         name = "ortp-0.24.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";

     

       8
       8
       +
           sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         meta = with stdenv.lib; {

+4

pkgs/top-level/all-packages.nix

···

       7575
       7575
        
         # failed to build

     

       7576
       7576
        
         mediastreamer = callPackage ../development/libraries/mediastreamer { };

     

       7577
       7577
        
       

     

       7578
       7578
       +
         mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };

     

       7579
       7579
       +
       

     

       7578
       7580
        
         menu-cache = callPackage ../development/libraries/menu-cache { };

     

       7579
       7581
        
       

     

       7580
       7582
        
         mesaSupported = lib.elem system lib.platforms.mesaPlatforms;

     
···

       7786
       7788
        
         ois = callPackage ../development/libraries/ois {};

     

       7787
       7789
        
       

     

       7788
       7790
        
         opal = callPackage ../development/libraries/opal {};

     

       7791
       7791
       +
       

     

       7792
       7792
       +
         openh264 = callPackage ../development/libraries/openh264 { };

     

       7789
       7793
        
       

     

       7790
       7794
        
         openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };

     

       7791
       7795
        
         openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { };