commit 6a11b11a7d8d89e724d0c1670777d196204f33e4 · pyrox.dev/nixpkgs

+18 -28

pkgs/applications/video/handbrake/default.nix

···

       7
       7
        
       # This has the benefits of providing improvements to other packages,

     

       8
       8
        
       # making licenses more clear and reducing compile time/install size.

     

       9
       9
        
       #

     

       10
       10
       -
       # For compliance, the unfree codec faac is optionally spliced out.

     

       11
       11
       -
       #

     

       12
       10
        
       # Only tested on Linux

     

       13
       11
        
       #

     

       14
       12
        
       # TODO: package and use libappindicator

     
···

       18
       16
        
         autoconf, automake, libtool, m4,

     

       19
       17
        
         libass, libsamplerate, fribidi, libxml2, bzip2,

     

       20
       18
        
         libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,

     

       21
       21
       -
         lame, faac, ffmpeg, libdvdread, libdvdnav, libbluray,

     

       22
       22
       -
         mp4v2, mpeg2dec, x264, libmkv,

     

       19
       19
       +
         lame, ffmpeg, libdvdread, libdvdnav, libbluray,

     

       20
       20
       +
         mp4v2, mpeg2dec, x264, x265, libmkv,

     

       23
       21
        
         fontconfig, freetype, hicolor_icon_theme,

     

       24
       24
       -
         glib, gtk, webkitgtk, intltool, libnotify,

     

       25
       25
       -
         gst_all_1, dbus_glib, udev, libgudev,

     

       26
       26
       -
         useGtk ? true,

     

       27
       27
       -
         useWebKitGtk ? false # This prevents ghb from starting in my tests

     

       22
       22
       +
         glib, gtk3, intltool, libnotify,

     

       23
       23
       +
         gst_all_1, dbus_glib, udev, libgudev, libvpx,

     

       24
       24
       +
         wrapGAppsHook,

     

       25
       25
       +
         useGtk ? true

     

       28
       26
        
       }:

     

       29
       27
        
       

     

       30
       28
        
       stdenv.mkDerivation rec {

     

       31
       31
       -
         version = "0.9.9";

     

       29
       29
       +
         version = "0.10.5";

     

       32
       30
        
         name = "handbrake-${version}";

     

       33
       31
        
       

     

       34
       34
       -
         # ToDo: doesn't work (yet)

     

       35
       35
       -
         allowUnfree = false; # config.allowUnfree or false;

     

       36
       36
       -
       

     

       37
       32
        
         buildInputsX = stdenv.lib.optionals useGtk [

     

       38
       38
       -
           glib gtk intltool libnotify

     

       33
       33
       +
           glib gtk3 intltool libnotify

     

       39
       34
        
           gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev

     

       40
       35
        
           libgudev

     

       41
       41
       -
         ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ];

     

       42
       42
       -
       

     

       43
       43
       -
         # Did not test compiling with it

     

       44
       44
       -
         unfreeInputs = stdenv.lib.optional allowUnfree faac;

     

       36
       36
       +
           wrapGAppsHook

     

       37
       37
       +
         ];

     

       45
       38
        
       

     

       46
       39
        
         nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];

     

       47
       40
        
         buildInputs = [

     

       48
       41
        
           fribidi fontconfig freetype hicolor_icon_theme

     

       49
       42
        
           libass libsamplerate libxml2 bzip2

     

       50
       43
        
           libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac

     

       51
       51
       -
           lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264

     

       52
       52
       -
         ] ++ buildInputsX ++ unfreeInputs;

     

       44
       44
       +
           lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx

     

       45
       45
       +
         ] ++ buildInputsX;

     

       53
       46
        
       

     

       54
       47
        
       

     

       55
       48
        
         src = fetchurl {

     

       56
       49
        
           url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2";

     

       57
       57
       -
           sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7";

     

       50
       50
       +
           sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv";

     

       58
       51
        
         };

     

       59
       59
       -
       

     

       60
       60
       -
         patches = stdenv.lib.optional (! allowUnfree) ./disable-unfree.patch;

     

       61
       52
        
       

     

       62
       53
        
         preConfigure = ''

     

       63
       54
        
           # Fake wget to prevent downloads

     
···

       72
       63
        
           sed -i '/MODULES += contrib/d' make/include/main.defs

     

       73
       64
        
           sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules

     

       74
       65
        
       

     

       75
       75
       -
           # disable faac if non-free

     

       76
       76
       -
           if [ -z "$allowUnfree" ]; then

     

       77
       77
       -
             rm libhb/encfaac.c

     

       78
       78
       -
           fi

     

       66
       66
       +
           patch -p1 -R < ${./handbrake-0.10.3-nolibav.patch}

     

       79
       67
        
         '';

     

       80
       68
        
       

     

       81
       81
       -
         configureFlags = "--enable-fdk-aac ${if useGtk then "--disable-gtk-update-checks" else "--disable-gtk"}";

     

       69
       69
       +
         configureFlags = [

     

       70
       70
       +
           "--enable-fdk-aac"

     

       71
       71
       +
           (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")

     

       72
       72
       +
         ];

     

       82
       73
        
       

     

       83
       74
        
         preBuild = ''

     

       84
       75
        
           cd build

     
···

       90
       81
        
           longDescription = ''

     

       91
       82
        
             Handbrake is a versatile transcoding DVD ripper. This package

     

       92
       83
        
             provides the cli HandbrakeCLI and the GTK+ version ghb.

     

       93
       93
       -
             The faac library is disabled if you're compiling free-only.

     

       94
       84
        
           '';

     

       95
       85
        
           license = stdenv.lib.licenses.gpl2;

     

       96
       86
        
           maintainers = [ stdenv.lib.maintainers.wmertens ];

-101

pkgs/applications/video/handbrake/disable-unfree.patch

···

       1
       1
       -
       diff -ru HandBrake-0.9.9-orig/gtk/configure.ac HandBrake-0.9.9/gtk/configure.ac

     

       2
       2
       -
       --- HandBrake-0.9.9-orig/gtk/configure.ac	2014-05-02 22:50:00.047305795 +0200

     

       3
       3
       -
       +++ HandBrake-0.9.9/gtk/configure.ac	2014-05-02 22:48:57.119304020 +0200

     

       4
       4
       -
       @@ -203,7 +203,7 @@

     

       5
       5
       -
            ;;

     

       6
       6
       -
        esac

     

       7
       7
       -
        

     

       8
       8
       -
       -HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"

     

       9
       9
       -
       +HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"

     

       10
       10
       -
        

     

       11
       11
       -
        if test "x$use_fdk_aac" = "xyes" ; then

     

       12
       12
       -
            HB_LIBS+=" -lfdk-aac"

     

       13
       13
       -
       diff -ru HandBrake-0.9.9-orig/gtk/src/preset_xlat.c HandBrake-0.9.9/gtk/src/preset_xlat.c

     

       14
       14
       -
       --- HandBrake-0.9.9-orig/gtk/src/preset_xlat.c	2014-05-02 22:50:00.043305794 +0200

     

       15
       15
       -
       +++ HandBrake-0.9.9/gtk/src/preset_xlat.c	2014-05-02 22:42:20.987292846 +0200

     

       16
       16
       -
       @@ -260,7 +260,6 @@

     

       17
       17
       -
        

     

       18
       18
       -
        static value_map_t acodec_xlat[] =

     

       19
       19
       -
        {

     

       20
       20
       -
       -    {"AAC (faac)", "faac"},

     

       21
       21
       -
            {"AC3 Passthru", "ac3"},

     

       22
       22
       -
            {"MP3 (lame)", "lame"},

     

       23
       23
       -
            {"Vorbis (vorbis)", "vorbis"},

     

       24
       24
       -
       diff -ru HandBrake-0.9.9-orig/gtk/src/presets.c HandBrake-0.9.9/gtk/src/presets.c

     

       25
       25
       -
       --- HandBrake-0.9.9-orig/gtk/src/presets.c	2014-05-02 22:50:00.043305794 +0200

     

       26
       26
       -
       +++ HandBrake-0.9.9/gtk/src/presets.c	2014-05-02 22:42:41.283293419 +0200

     

       27
       27
       -
       @@ -2029,8 +2029,6 @@

     

       28
       28
       -
        

     

       29
       29
       -
        static value_map_t acodec_xlat_compat[] =

     

       30
       30
       -
        {

     

       31
       31
       -
       -    {"AAC (CoreAudio)", "faac"},

     

       32
       32
       -
       -    {"HE-AAC (CoreAudio)", "faac"},

     

       33
       33
       -
            {"AC3 (ffmpeg)", "ac3"},

     

       34
       34
       -
            {"AC3", "ac3"},

     

       35
       35
       -
            {"MP3 Passthru", "mp3pass"},

     

       36
       36
       -
       diff -ru HandBrake-0.9.9-orig/libhb/common.c HandBrake-0.9.9/libhb/common.c

     

       37
       37
       -
       --- HandBrake-0.9.9-orig/libhb/common.c	2014-05-02 22:50:00.047305795 +0200

     

       38
       38
       -
       +++ HandBrake-0.9.9/libhb/common.c	2014-05-02 22:37:24.679284489 +0200

     

       39
       39
       -
       @@ -126,7 +126,6 @@

     

       40
       40
       -
            { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },

     

       41
       41
       -
            { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },

     

       42
       42
       -
        #endif

     

       43
       43
       -
       -    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },

     

       44
       44
       -
        #ifdef USE_FDK_AAC

     

       45
       45
       -
            { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },

     

       46
       46
       -
            { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },

     

       47
       47
       -
       diff -ru HandBrake-0.9.9-orig/libhb/common.h HandBrake-0.9.9/libhb/common.h

     

       48
       48
       -
       --- HandBrake-0.9.9-orig/libhb/common.h	2014-05-02 22:50:00.047305795 +0200

     

       49
       49
       -
       +++ HandBrake-0.9.9/libhb/common.h	2014-05-02 22:39:37.839288245 +0200

     

       50
       50
       -
       @@ -945,7 +945,6 @@

     

       51
       51
       -
        extern hb_work_object_t hb_decavcodeca;

     

       52
       52
       -
        extern hb_work_object_t hb_decavcodecv;

     

       53
       53
       -
        extern hb_work_object_t hb_declpcm;

     

       54
       54
       -
       -extern hb_work_object_t hb_encfaac;

     

       55
       55
       -
        extern hb_work_object_t hb_enclame;

     

       56
       56
       -
        extern hb_work_object_t hb_encvorbis;

     

       57
       57
       -
        extern hb_work_object_t hb_muxer;

     

       58
       58
       -
       diff -ru HandBrake-0.9.9-orig/libhb/hb.c HandBrake-0.9.9/libhb/hb.c

     

       59
       59
       -
       --- HandBrake-0.9.9-orig/libhb/hb.c	2014-05-02 22:50:00.047305795 +0200

     

       60
       60
       -
       +++ HandBrake-0.9.9/libhb/hb.c	2014-05-02 22:39:02.287287242 +0200

     

       61
       61
       -
       @@ -487,7 +487,6 @@

     

       62
       62
       -
        	hb_register( &hb_decavcodeca );

     

       63
       63
       -
        	hb_register( &hb_decavcodecv );

     

       64
       64
       -
        	hb_register( &hb_declpcm );

     

       65
       65
       -
       -	hb_register( &hb_encfaac );

     

       66
       66
       -
        	hb_register( &hb_enclame );

     

       67
       67
       -
        	hb_register( &hb_encvorbis );

     

       68
       68
       -
        	hb_register( &hb_muxer );

     

       69
       69
       -
       @@ -588,7 +587,6 @@

     

       70
       70
       -
        	hb_register( &hb_decavcodeca );

     

       71
       71
       -
        	hb_register( &hb_decavcodecv );

     

       72
       72
       -
        	hb_register( &hb_declpcm );

     

       73
       73
       -
       -	hb_register( &hb_encfaac );

     

       74
       74
       -
        	hb_register( &hb_enclame );

     

       75
       75
       -
        	hb_register( &hb_encvorbis );

     

       76
       76
       -
        	hb_register( &hb_muxer );

     

       77
       77
       -
       diff -ru HandBrake-0.9.9-orig/libhb/module.defs HandBrake-0.9.9/libhb/module.defs

     

       78
       78
       -
       --- HandBrake-0.9.9-orig/libhb/module.defs	2014-05-02 22:50:00.047305795 +0200

     

       79
       79
       -
       +++ HandBrake-0.9.9/libhb/module.defs	2014-05-02 22:39:25.727287903 +0200

     

       80
       80
       -
       @@ -95,7 +95,7 @@

     

       81
       81
       -
        LIBHB.lib = $(LIBHB.build/)hb.lib

     

       82
       82
       -
        

     

       83
       83
       -
        LIBHB.dll.libs = $(foreach n, \

     

       84
       84
       -
       -        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \

     

       85
       85
       -
       +        a52 ass avcodec avformat avutil avresample dvdnav dvdread \

     

       86
       86
       -
                fontconfig freetype mkv mpeg2 mp3lame mp4v2 \

     

       87
       87
       -
                ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \

     

       88
       88
       -
                $(CONTRIB.build/)lib/lib$(n).a )

     

       89
       89
       -
       Only in HandBrake-0.9.9: libhb-orig

     

       90
       90
       -
       diff -ru HandBrake-0.9.9orig/test/module.defs HandBrake-0.9.9/test/module.defs

     

       91
       91
       -
       --- HandBrake-0.9.9-orig/test/module.defs	2014-05-02 23:15:10.575348401 +0200

     

       92
       92
       -
       +++ HandBrake-0.9.9/test/module.defs	2014-05-02 23:17:00.523351502 +0200

     

       93
       93
       -
       @@ -14,7 +14,7 @@

     

       94
       94
       -
        TEST.libs = $(LIBHB.a)

     

       95
       95
       -
        

     

       96
       96
       -
        TEST.GCC.l = \

     

       97
       97
       -
       -        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \

     

       98
       98
       -
       +        a52 ass avcodec avformat avutil avresample dvdnav dvdread \

     

       99
       99
       -
                fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \

     

       100
       100
       -
                samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \

     

       101
       101
       -
                bluray xml2 bz2 z

+76

pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch

···

       1
       1
       +
       From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: John Stebbins <jstebbins.hb@gmail.com>

     

       3
       3
       +
       Date: Tue, 3 Nov 2015 10:16:01 -0800

     

       4
       4
       +
       Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
       diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c

     

       8
       8
       +
       index 0d70597..373c2ab 100644

     

       9
       9
       +
       --- a/libhb/muxavformat.c

     

       10
       10
       +
       +++ b/libhb/muxavformat.c

     

       11
       11
       +
       @@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m )

     

       12
       12
       +
            hb_mux_data_t * track;

     

       13
       13
       +
            int meta_mux;

     

       14
       14
       +
            int max_tracks;

     

       15
       15
       +
       -    int ii, ret;

     

       16
       16
       +
       +    int ii, jj, ret;

     

       17
       17
       +
        

     

       18
       18
       +
            int clock_min, clock_max, clock;

     

       19
       19
       +
            hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);

     

       20
       20
       +
       @@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m )

     

       21
       21
       +
                }

     

       22
       22
       +
            }

     

       23
       23
       +
        

     

       24
       24
       +
       +    // Check for audio track associations

     

       25
       25
       +
       +    for (ii = 0; ii < hb_list_count(job->list_audio); ii++)

     

       26
       26
       +
       +    {

     

       27
       27
       +
       +        audio = hb_list_item(job->list_audio, ii);

     

       28
       28
       +
       +        switch (audio->config.out.codec & HB_ACODEC_MASK)

     

       29
       29
       +
       +        {

     

       30
       30
       +
       +            case HB_ACODEC_FFAAC:

     

       31
       31
       +
       +            case HB_ACODEC_CA_AAC:

     

       32
       32
       +
       +            case HB_ACODEC_CA_HAAC:

     

       33
       33
       +
       +            case HB_ACODEC_FDK_AAC:

     

       34
       34
       +
       +            case HB_ACODEC_FDK_HAAC:

     

       35
       35
       +
       +                break;

     

       36
       36
       +
       +

     

       37
       37
       +
       +            default:

     

       38
       38
       +
       +            {

     

       39
       39
       +
       +                // Mark associated fallback audio tracks for any non-aac track

     

       40
       40
       +
       +                for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ )

     

       41
       41
       +
       +                {

     

       42
       42
       +
       +                    hb_audio_t    * fallback;

     

       43
       43
       +
       +                    int             codec;

     

       44
       44
       +
       +

     

       45
       45
       +
       +                    if (ii == jj) continue;

     

       46
       46
       +
       +

     

       47
       47
       +
       +                    fallback = hb_list_item( job->list_audio, jj );

     

       48
       48
       +
       +                    codec = fallback->config.out.codec & HB_ACODEC_MASK;

     

       49
       49
       +
       +                    if (fallback->config.in.track == audio->config.in.track &&

     

       50
       50
       +
       +                        (codec == HB_ACODEC_FFAAC ||

     

       51
       51
       +
       +                         codec == HB_ACODEC_CA_AAC ||

     

       52
       52
       +
       +                         codec == HB_ACODEC_CA_HAAC ||

     

       53
       53
       +
       +                         codec == HB_ACODEC_FDK_AAC ||

     

       54
       54
       +
       +                         codec == HB_ACODEC_FDK_HAAC))

     

       55
       55
       +
       +                    {

     

       56
       56
       +
       +                        hb_mux_data_t * fallback_track;

     

       57
       57
       +
       +                        int           * sd;

     

       58
       58
       +
       +

     

       59
       59
       +
       +                        track = audio->priv.mux_data;

     

       60
       60
       +
       +                        fallback_track = fallback->priv.mux_data;

     

       61
       61
       +
       +                        sd = (int*)av_stream_new_side_data(track->st,

     

       62
       62
       +
       +                                                     AV_PKT_DATA_FALLBACK_TRACK,

     

       63
       63
       +
       +                                                     sizeof(int));

     

       64
       64
       +
       +                        if (sd != NULL)

     

       65
       65
       +
       +                        {

     

       66
       66
       +
       +                            *sd = fallback_track->st->index;

     

       67
       67
       +
       +                        }

     

       68
       68
       +
       +                    }

     

       69
       69
       +
       +                }

     

       70
       70
       +
       +            } break;

     

       71
       71
       +
       +        }

     

       72
       72
       +
       +    }

     

       73
       73
       +
       +

     

       74
       74
       +
            char * subidx_fmt =

     

       75
       75
       +
                "size: %dx%d\n"

     

       76
       76
       +
                "org: %d, %d\n"

-1

pkgs/top-level/all-packages.nix

···

       13855
       13855
        
         lxdvdrip = callPackage ../applications/video/lxdvdrip { };

     

       13856
       13856
        
       

     

       13857
       13857
        
         handbrake = callPackage ../applications/video/handbrake {

     

       13858
       13858
       -
           webkitgtk = webkitgtk24x;

     

       13859
       13858
        
           ffmpeg = ffmpeg_2;

     

       13860
       13859
        
         };

     

       13861
       13860