diff --git a/hardware/info/gkrellm/files/drop_privileges.patch b/hardware/info/gkrellm/files/drop_privileges.patch deleted file mode 100644 index 7f8823669b..0000000000 --- a/hardware/info/gkrellm/files/drop_privileges.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gkrellm-2.2.10-old/server/gkrellmd.conf gkrellm-2.2.10/server/gkrellmd.conf ---- gkrellm-2.2.10-old/server/gkrellmd.conf 2007-05-08 00:27:05.073863232 +0300 -+++ gkrellm-2.2.10/server/gkrellmd.conf 2007-05-08 00:27:35.880179960 +0300 -@@ -26,6 +26,8 @@ - # - #user nobody - #group proc -+user nobody -+group nogroup - - # Run in background and detach from the controlling terminal - #detach diff --git a/hardware/info/gkrellm/files/gkrellm.desktop b/hardware/info/gkrellm/files/gkrellm.desktop deleted file mode 100644 index 849fbda851..0000000000 --- a/hardware/info/gkrellm/files/gkrellm.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=GKrellM -Name[tr]=GKrellM -GenericName=Krell Monitor -GenericName[tr]=Sistem Krell İzleyicisi -Icon=gkrellm -Exec=gkrellm -Terminal=false -StartupNotify=false -Categories=Application;System; diff --git a/hardware/info/gkrellm/files/gkrellm.png b/hardware/info/gkrellm/files/gkrellm.png deleted file mode 100644 index 3201ad815e..0000000000 Binary files a/hardware/info/gkrellm/files/gkrellm.png and /dev/null differ diff --git a/hardware/info/gkrellm/files/gkrellmd-conf.patch b/hardware/info/gkrellm/files/gkrellmd-conf.patch deleted file mode 100644 index e3e80618f4..0000000000 --- a/hardware/info/gkrellm/files/gkrellmd-conf.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: gkrellm-2.3.5/server/gkrellmd.conf -=================================================================== ---- gkrellm-2.3.5.orig/server/gkrellmd.conf -+++ gkrellm-2.3.5/server/gkrellmd.conf -@@ -4,7 +4,7 @@ - # the client update frequency. Values may be from 1 to 10 and should be - # smaller values to reduce network traffic. - # --#update-hz 3 -+update-hz 3 - - # Limit number of simultaneous clients allowed to connect. - # -@@ -17,7 +17,7 @@ - - # Specify the port to listen on for connections. - # --#port 19150 -+port 19150 - - # List of hosts allowed to connect. If no hosts are specified in a - # gkrellmd.conf file or on the command line, all hosts will be allowed. -@@ -38,17 +38,17 @@ group nogroup - # Create a PID file for the running gkrellmd. Default is no PID file. - # NOTE: Option ignored on Windows - # --#pidfile /var/run/gkrellmd.pid -+pidfile /run/gkrellmd.pid - - # Run in background and detach from the controlling terminal - # NOTE: Option ignored on Windows - # --#detach -+detach - - # Enable writing logging message to the system syslog file - # NOTE: On windows this enables logging to the windows event log - # --#syslog -+syslog - - # Time interval between checks for various monitors. If nfs-interval - # is <= 0 then gkrellmd will not read data for nfs file system types. diff --git a/hardware/info/gkrellm/files/gkrellmd.service b/hardware/info/gkrellm/files/gkrellmd.service deleted file mode 100644 index d621875882..0000000000 --- a/hardware/info/gkrellm/files/gkrellmd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=GNU Krell Monitors server -After=network.target syslog.target hddtemp.service - -[Service] -ExecStart=/usr/bin/gkrellmd - -[Install] -WantedBy=multi-user.target diff --git a/multimedia/sound/libdca/files/libdca-0.0.5-cflags.patch b/multimedia/sound/libdca/files/libdca-0.0.5-cflags.patch deleted file mode 100644 index 16e897f79e..0000000000 --- a/multimedia/sound/libdca/files/libdca-0.0.5-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libdca-0.0.5/configure.ac -=================================================================== ---- libdca-0.0.5.orig/configure.ac -+++ libdca-0.0.5/configure.ac -@@ -32,7 +32,6 @@ if test x"$GCC" = x"yes"; then - TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"` - changequote([,]) - TRY_CFLAGS="$TRY_CFLAGS -O3" -- AC_TRY_CFLAGS([$TRY_CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS; CFLAGS=""]) - - AC_ARG_ENABLE([debug], - [ --enable-debug debug mode configuration]) diff --git a/multimedia/sound/libdca/files/libdca-0.0.5-constant.patch b/multimedia/sound/libdca/files/libdca-0.0.5-constant.patch deleted file mode 100644 index 3aafc527c0..0000000000 --- a/multimedia/sound/libdca/files/libdca-0.0.5-constant.patch +++ /dev/null @@ -1,719 +0,0 @@ -Index: libdca-0.0.5/libdca/parse.c -=================================================================== ---- libdca-0.0.5.orig/libdca/parse.c -+++ libdca-0.0.5/libdca/parse.c -@@ -548,7 +548,7 @@ static int dca_subframe_header (dca_stat - /* Scale factors */ - for (j = 0; j < state->prim_channels; j++) - { -- int *scale_table; -+ const int *scale_table; - int scale_sum; - - for (k = 0; k < state->subband_activity[j]; k++) -@@ -761,7 +761,7 @@ static int dca_subsubframe (dca_state_t - int k, l; - int subsubframe = state->current_subsubframe; - -- double *quant_step_table; -+ const double *quant_step_table; - - /* FIXME */ - double subband_samples[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8]; -@@ -1145,7 +1145,7 @@ static void qmf_32_subbands (dca_state_t - double samples_in[32][8], sample_t *samples_out, - double scale, sample_t bias) - { -- double *prCoeff; -+ const double *prCoeff; - int i, j, k; - double raXin[32]; - -@@ -1236,7 +1236,7 @@ static void lfe_interpolation_fir (int n - */ - - int nDeciFactor, k, J; -- double *prCoeff; -+ const double *prCoeff; - - int NumFIRCoef = 512; /* Number of FIR coefficients */ - int nInterpIndex = 0; /* Index to the interpolated samples */ -Index: libdca-0.0.5/libdca/tables_fir.h -=================================================================== ---- libdca-0.0.5.orig/libdca/tables_fir.h -+++ libdca-0.0.5/libdca/tables_fir.h -@@ -21,7 +21,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --double fir_32bands_perfect[] = -+static const double fir_32bands_perfect[] = - { - +1.135985195E-010, - -6.022448247E-007, -@@ -537,7 +537,7 @@ double fir_32bands_perfect[] = - -1.135985195E-010 - }; - --double fir_32bands_nonperfect[] = -+static const double fir_32bands_nonperfect[] = - { - -1.390191784E-007, - -1.693738625E-007, -@@ -1053,7 +1053,7 @@ double fir_32bands_nonperfect[] = - +1.390191784E-007 - }; - --double lfe_fir_64[] = -+static const double lfe_fir_64[] = - { - 2.6584343868307770E-004, - 8.1793652498163280E-005, -@@ -1569,7 +1569,7 @@ double lfe_fir_64[] = - 2.6584343868307770E-004 - }; - --double lfe_fir_128[] = -+static const double lfe_fir_128[] = - { - 0.00053168571, - 0.00016358691, -Index: libdca-0.0.5/libdca/tables_huffman.h -=================================================================== ---- libdca-0.0.5.orig/libdca/tables_huffman.h -+++ libdca-0.0.5/libdca/tables_huffman.h -@@ -29,7 +29,7 @@ typedef struct huff_entry_s - - } huff_entry_t; - --huff_entry_t bitalloc_a_12[] = -+static const huff_entry_t bitalloc_a_12[] = - { - { 1, 0, 1}, { 2, 2, 2}, { 3, 6, 3}, { 4, 14, 4}, - { 5, 30, 5}, { 6, 62, 6}, { 8, 255, 7}, { 8, 254, 8}, -@@ -37,7 +37,7 @@ huff_entry_t bitalloc_a_12[] = - { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_12[] = -+static const huff_entry_t bitalloc_b_12[] = - { - { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 5, 15, 4}, - { 5, 12, 5}, { 6, 29, 6}, { 7, 57, 7}, { 7, 56, 8}, -@@ -45,7 +45,7 @@ huff_entry_t bitalloc_b_12[] = - { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_12[] = -+static const huff_entry_t bitalloc_c_12[] = - { - { 2, 0, 1}, { 3, 7, 2}, { 3, 5, 3}, { 3, 4, 4}, - { 3, 2, 5}, { 4, 13, 6}, { 4, 12, 7}, { 4, 6, 8}, -@@ -53,7 +53,7 @@ huff_entry_t bitalloc_c_12[] = - { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_12[] = -+static const huff_entry_t bitalloc_d_12[] = - { - { 2, 3, 1}, { 2, 2, 2}, { 2, 0, 3}, { 3, 2, 4}, - { 4, 6, 5}, { 5, 14, 6}, { 6, 30, 7}, { 7, 62, 8}, -@@ -61,7 +61,7 @@ huff_entry_t bitalloc_d_12[] = - { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_12[] = -+static const huff_entry_t bitalloc_e_12[] = - { - { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 4, 6, 4}, - { 5, 14, 5}, { 7, 63, 6}, { 7, 61, 7}, { 8, 124, 8}, -@@ -69,7 +69,7 @@ huff_entry_t bitalloc_e_12[] = - { 0, 0, 0} - }; - --huff_entry_t *bitalloc_12[] = -+static const huff_entry_t *const bitalloc_12[] = - { - bitalloc_a_12, - bitalloc_b_12, -@@ -78,7 +78,7 @@ huff_entry_t *bitalloc_12[] = - bitalloc_e_12 - }; - --huff_entry_t scales_a_129[] = -+static const huff_entry_t scales_a_129[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -115,7 +115,7 @@ huff_entry_t scales_a_129[] = - {14, 15024,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_b_129[] = -+static const huff_entry_t scales_b_129[] = - { - { 3, 3, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 10, 4}, -@@ -152,7 +152,7 @@ huff_entry_t scales_b_129[] = - {15, 3936,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_c_129[] = -+static const huff_entry_t scales_c_129[] = - { - { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4}, -@@ -189,7 +189,7 @@ huff_entry_t scales_c_129[] = - {15, 20944,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_d_129[] = -+static const huff_entry_t scales_d_129[] = - { - { 2, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 26, 4}, -@@ -226,7 +226,7 @@ huff_entry_t scales_d_129[] = - {15, 28516,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_e_129[] = -+static const huff_entry_t scales_e_129[] = - { - { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 7, 2}, - { 4, 6, -2}, { 4, 3, 3}, { 4, 2, -3}, { 5, 31, 4}, -@@ -263,7 +263,7 @@ huff_entry_t scales_e_129[] = - {16, 57172,-64}, { 0, 0, 0} - }; - --huff_entry_t *scales_129[] = -+static const huff_entry_t *const scales_129[] = - { - scales_a_129, - scales_b_129, -@@ -272,36 +272,36 @@ huff_entry_t *scales_129[] = - scales_e_129 - }; - --huff_entry_t bitalloc_a_3[] = -+static const huff_entry_t bitalloc_a_3[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 2, 3, -1}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_4[] = -+static const huff_entry_t bitalloc_a_4[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 3, 6, 2}, { 3, 7, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_4[] = -+static const huff_entry_t bitalloc_b_4[] = - { - { 2, 2, 0}, { 3, 6, 1}, { 3, 7, 2}, { 1, 0, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_4[] = -+static const huff_entry_t bitalloc_c_4[] = - { - { 3, 6, 0}, { 3, 7, 1}, { 1, 0, 2}, { 2, 2, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_4[] = -+static const huff_entry_t bitalloc_d_4[] = - { - { 2, 0, 0}, { 2, 1, 1}, { 2, 2, 2}, { 2, 3, 3}, - { 0, 0, 0} - }; - --huff_entry_t *tmode[] = -+static const huff_entry_t *const tmode[] = - { - bitalloc_a_4, - bitalloc_b_4, -@@ -309,64 +309,64 @@ huff_entry_t *tmode[] = - bitalloc_d_4 - }; - --huff_entry_t bitalloc_a_5[] = -+static const huff_entry_t bitalloc_a_5[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 3, 6, -1}, { 4, 14, 2}, - { 4, 15, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_5[] = -+static const huff_entry_t bitalloc_b_5[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 2, 1, -1}, { 3, 6, 2}, - { 3, 7, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_5[] = -+static const huff_entry_t bitalloc_c_5[] = - { - { 1, 0, 0}, { 3, 4, 1}, { 3, 5, -1}, { 3, 6, 2}, - { 3, 7, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_7[] = -+static const huff_entry_t bitalloc_a_7[] = - { - { 1, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 4, 2}, - { 4, 14, -2}, { 5, 31, 3}, { 5, 30, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_7[] = -+static const huff_entry_t bitalloc_b_7[] = - { - { 2, 3, 0}, { 2, 1, 1}, { 2, 0, -1}, { 3, 4, 2}, - { 4, 11, -2}, { 5, 21, 3}, { 5, 20, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_7[] = -+static const huff_entry_t bitalloc_c_7[] = - { - { 2, 3, 0}, { 2, 2, 1}, { 2, 1, -1}, { 4, 3, 2}, - { 4, 2, -2}, { 4, 1, 3}, { 4, 0, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_9[] = -+static const huff_entry_t bitalloc_a_9[] = - { - { 1, 0, 0}, { 3, 7, 1}, { 3, 5, -1}, { 4, 13, 2}, - { 4, 9, -2}, { 4, 8, 3}, { 5, 25, -3}, { 6, 49, 4}, - { 6, 48, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_9[] = -+static const huff_entry_t bitalloc_b_9[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 3, 2}, - { 3, 2, -2}, { 5, 27, 3}, { 5, 26, -3}, { 5, 25, 4}, - { 5, 24, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_9[] = -+static const huff_entry_t bitalloc_c_9[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 6, 2}, - { 3, 2, -2}, { 4, 6, 3}, { 5, 15, -3}, { 6, 29, 4}, - { 6, 28, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_13[] = -+static const huff_entry_t bitalloc_a_13[] = - { - { 1, 0, 0}, { 3, 4, 1}, { 4, 15, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 10, 3}, { 5, 29, -3}, { 5, 22, 4}, -@@ -374,7 +374,7 @@ huff_entry_t bitalloc_a_13[] = - { 7, 112, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_13[] = -+static const huff_entry_t bitalloc_b_13[] = - { - { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, - { 4, 15, -2}, { 4, 9, 3}, { 4, 7, -3}, { 4, 6, 4}, -@@ -382,7 +382,7 @@ huff_entry_t bitalloc_b_13[] = - { 6, 56, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_13[] = -+static const huff_entry_t bitalloc_c_13[] = - { - { 3, 5, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 2, 2}, - { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 12, 4}, -@@ -390,7 +390,7 @@ huff_entry_t bitalloc_c_13[] = - { 5, 4, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_17[] = -+static const huff_entry_t bitalloc_a_17[] = - { - { 2, 1, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 4, 2}, - { 3, 1, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 0, 4}, -@@ -399,7 +399,7 @@ huff_entry_t bitalloc_a_17[] = - {12, 340, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_17[] = -+static const huff_entry_t bitalloc_b_17[] = - { - { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, - { 4, 15, -2}, { 4, 9, 3}, { 4, 8, -3}, { 5, 29, 4}, -@@ -408,7 +408,7 @@ huff_entry_t bitalloc_b_17[] = - { 8, 124, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_17[] = -+static const huff_entry_t bitalloc_c_17[] = - { - { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 4, 4}, -@@ -417,7 +417,7 @@ huff_entry_t bitalloc_c_17[] = - { 7, 44, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_17[] = -+static const huff_entry_t bitalloc_d_17[] = - { - { 1, 0, 0}, { 3, 7, 1}, { 3, 6, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 5, 19, 3}, { 5, 18, -3}, { 6, 35, 4}, -@@ -426,7 +426,7 @@ huff_entry_t bitalloc_d_17[] = - { 9, 256, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_17[] = -+static const huff_entry_t bitalloc_e_17[] = - { - { 1, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 12, 2}, - { 5, 31, -2}, { 5, 28, 3}, { 5, 27, -3}, { 6, 60, 4}, -@@ -435,7 +435,7 @@ huff_entry_t bitalloc_e_17[] = - { 8, 232, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_17[] = -+static const huff_entry_t bitalloc_f_17[] = - { - { 3, 6, 0}, { 3, 5, 1}, { 3, 4, -1}, { 3, 2, 2}, - { 3, 1, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 6, 4}, -@@ -444,7 +444,7 @@ huff_entry_t bitalloc_f_17[] = - { 8, 4, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_17[] = -+static const huff_entry_t bitalloc_g_17[] = - { - { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 14, 4}, -@@ -453,7 +453,7 @@ huff_entry_t bitalloc_g_17[] = - { 8, 96, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_25[] = -+static const huff_entry_t bitalloc_a_25[] = - { - { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 5, 4}, -@@ -464,7 +464,7 @@ huff_entry_t bitalloc_a_25[] = - {14, 10324,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_25[] = -+static const huff_entry_t bitalloc_b_25[] = - { - { 3, 5, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, -@@ -475,7 +475,7 @@ huff_entry_t bitalloc_b_25[] = - { 9, 28,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_25[] = -+static const huff_entry_t bitalloc_c_25[] = - { - { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 12, 2}, - { 4, 11, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, -@@ -486,7 +486,7 @@ huff_entry_t bitalloc_c_25[] = - { 8, 76,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_25[] = -+static const huff_entry_t bitalloc_d_25[] = - { - { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 13, 4}, -@@ -497,7 +497,7 @@ huff_entry_t bitalloc_d_25[] = - {12, 1920,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_25[] = -+static const huff_entry_t bitalloc_e_25[] = - { - { 2, 3, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 4, 1, 3}, { 4, 0, -3}, { 5, 17, 4}, -@@ -508,7 +508,7 @@ huff_entry_t bitalloc_e_25[] = - { 8, 60,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_25[] = -+static const huff_entry_t bitalloc_f_25[] = - { - { 3, 1, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 14, 2}, - { 4, 13, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 8, 4}, -@@ -519,7 +519,7 @@ huff_entry_t bitalloc_f_25[] = - {10, 804,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_25[] = -+static const huff_entry_t bitalloc_g_25[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -530,7 +530,7 @@ huff_entry_t bitalloc_g_25[] = - {10, 936,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_33[] = -+static const huff_entry_t bitalloc_a_33[] = - { - { 3, 2, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 14, 2}, - { 4, 13, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 9, 4}, -@@ -543,7 +543,7 @@ huff_entry_t bitalloc_a_33[] = - {13, 5504,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_33[] = -+static const huff_entry_t bitalloc_b_33[] = - { - { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 4, 8, 3}, { 4, 7, -3}, { 4, 4, 4}, -@@ -556,7 +556,7 @@ huff_entry_t bitalloc_b_33[] = - {10, 780,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_33[] = -+static const huff_entry_t bitalloc_c_33[] = - { - { 4, 13, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2}, - { 4, 7, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 2, 4}, -@@ -569,7 +569,7 @@ huff_entry_t bitalloc_c_33[] = - { 9, 204,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_33[] = -+static const huff_entry_t bitalloc_d_33[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -582,7 +582,7 @@ huff_entry_t bitalloc_d_33[] = - {14, 15096,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_33[] = -+static const huff_entry_t bitalloc_e_33[] = - { - { 2, 2, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 12, 2}, - { 4, 7, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 27, 4}, -@@ -595,7 +595,7 @@ huff_entry_t bitalloc_e_33[] = - { 9, 456,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_33[] = -+static const huff_entry_t bitalloc_f_33[] = - { - { 4, 13, 0}, { 4, 12, 1}, { 4, 11, -1}, { 4, 9, 2}, - { 4, 8, -2}, { 4, 7, 3}, { 4, 6, -3}, { 4, 4, 4}, -@@ -608,7 +608,7 @@ huff_entry_t bitalloc_f_33[] = - {11, 1828,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_33[] = -+static const huff_entry_t bitalloc_g_33[] = - { - { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4}, -@@ -621,7 +621,7 @@ huff_entry_t bitalloc_g_33[] = - {10, 644,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_65[] = -+static const huff_entry_t bitalloc_a_65[] = - { - { 4, 6, 0}, { 4, 5, 1}, { 4, 4, -1}, { 4, 2, 2}, - { 4, 1, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 29, 4}, -@@ -642,7 +642,7 @@ huff_entry_t bitalloc_a_65[] = - {16, 40540,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_65[] = -+static const huff_entry_t bitalloc_b_65[] = - { - { 4, 4, 0}, { 4, 2, 1}, { 4, 1, -1}, { 5, 30, 2}, - { 5, 29, -2}, { 5, 26, 3}, { 5, 25, -3}, { 5, 23, 4}, -@@ -663,7 +663,7 @@ huff_entry_t bitalloc_b_65[] = - {12, 2700,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_65[] = -+static const huff_entry_t bitalloc_c_65[] = - { - { 5, 28, 0}, { 5, 25, 1}, { 5, 24, -1}, { 5, 23, 2}, - { 5, 22, -2}, { 5, 19, 3}, { 5, 18, -3}, { 5, 16, 4}, -@@ -684,7 +684,7 @@ huff_entry_t bitalloc_c_65[] = - {11, 1116,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_65[] = -+static const huff_entry_t bitalloc_d_65[] = - { - { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4}, -@@ -705,7 +705,7 @@ huff_entry_t bitalloc_d_65[] = - {15, 28848,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_65[] = -+static const huff_entry_t bitalloc_e_65[] = - { - { 3, 4, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 7, 2}, - { 4, 6, -2}, { 5, 29, 3}, { 5, 28, -3}, { 5, 23, 4}, -@@ -726,7 +726,7 @@ huff_entry_t bitalloc_e_65[] = - {10, 812,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_65[] = -+static const huff_entry_t bitalloc_f_65[] = - { - { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4}, -@@ -747,7 +747,7 @@ huff_entry_t bitalloc_f_65[] = - {14, 4064,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_65[] = -+static const huff_entry_t bitalloc_g_65[] = - { - { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2}, - { 4, 6, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 0, 4}, -@@ -768,7 +768,7 @@ huff_entry_t bitalloc_g_65[] = - {11, 268,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_129[] = -+static const huff_entry_t bitalloc_a_129[] = - { - { 4, 8, 0}, { 4, 10, 1}, { 4, 9, -1}, { 4, 0, 2}, - { 5, 31, -2}, { 5, 24, 3}, { 5, 23, -3}, { 5, 12, 4}, -@@ -805,7 +805,7 @@ huff_entry_t bitalloc_a_129[] = - {11, 1632,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_129[] = -+static const huff_entry_t bitalloc_b_129[] = - { - { 5, 10, 0}, { 5, 7, 1}, { 5, 6, -1}, { 5, 4, 2}, - { 5, 3, -2}, { 5, 0, 3}, { 6, 63, -3}, { 6, 60, 4}, -@@ -842,7 +842,7 @@ huff_entry_t bitalloc_b_129[] = - {14, 10716,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_129[] = -+static const huff_entry_t bitalloc_c_129[] = - { - { 6, 58, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2}, - { 6, 51, -2}, { 6, 49, 3}, { 6, 48, -3}, { 6, 46, 4}, -@@ -879,7 +879,7 @@ huff_entry_t bitalloc_c_129[] = - {13, 3676,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_129[] = -+static const huff_entry_t bitalloc_d_129[] = - { - { 4, 9, 0}, { 4, 6, 1}, { 4, 5, -1}, { 4, 2, 2}, - { 4, 1, -2}, { 5, 30, 3}, { 5, 29, -3}, { 5, 26, 4}, -@@ -916,7 +916,7 @@ huff_entry_t bitalloc_d_129[] = - {16, 42392,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_129[] = -+static const huff_entry_t bitalloc_e_129[] = - { - { 5, 12, 0}, { 5, 11, 1}, { 5, 10, -1}, { 5, 9, 2}, - { 5, 8, -2}, { 5, 7, 3}, { 5, 6, -3}, { 5, 4, 4}, -@@ -953,7 +953,7 @@ huff_entry_t bitalloc_e_129[] = - {16, 41276,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_129[] = -+static const huff_entry_t bitalloc_f_129[] = - { - { 6, 56, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2}, - { 6, 51, -2}, { 6, 50, 3}, { 6, 49, -3}, { 6, 48, 4}, -@@ -990,7 +990,7 @@ huff_entry_t bitalloc_f_129[] = - {15, 30252,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_129[] = -+static const huff_entry_t bitalloc_g_129[] = - { - { 4, 0, 0}, { 5, 29, 1}, { 5, 28, -1}, { 5, 25, 2}, - { 5, 24, -2}, { 5, 21, 3}, { 5, 20, -3}, { 5, 17, 4}, -@@ -1027,7 +1027,7 @@ huff_entry_t bitalloc_g_129[] = - {13, 7712,-64}, { 0, 0, 0} - }; - --huff_entry_t *bitalloc_select[11][8] = -+static const huff_entry_t *const bitalloc_select[11][8] = - { - { 0 }, - { bitalloc_a_3, 0 }, -@@ -1047,7 +1047,7 @@ huff_entry_t *bitalloc_select[11][8] = - bitalloc_e_129, bitalloc_f_129, bitalloc_g_129, 0 }, - }; - --static int InverseQ( dca_state_t * state, huff_entry_t * huff ) -+static int InverseQ( dca_state_t * state, const huff_entry_t * huff ) - { - int value = 0; - int length = 0, j; -Index: libdca-0.0.5/libdca/tables_quantization.h -=================================================================== ---- libdca-0.0.5.orig/libdca/tables_quantization.h -+++ libdca-0.0.5/libdca/tables_quantization.h -@@ -21,7 +21,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --int scale_factor_quant6[] = -+static const int scale_factor_quant6[] = - { - 1, 2, 2, 3, 3, 4, 6, 7, - 10, 12, 16, 20, 26, 34, 44, 56, -@@ -33,7 +33,7 @@ int scale_factor_quant6[] = - 1819701, 2344229, 3019952, 3890451, 5011872, 6456542, 8317638, 0 - }; - --int scale_factor_quant7[] = -+static const int scale_factor_quant7[] = - { - 1, 1, 2, 2, 2, 2, 3, 3, - 3, 4, 4, 5, 6, 7, 7, 8, -@@ -54,7 +54,7 @@ int scale_factor_quant7[] = - }; - - /* 20bits unsigned fractional binary codes */ --int lossy_quant[] = -+static const int lossy_quant[] = - { - 0, 6710886, 4194304, 3355443, 2474639, 2097152, 1761608, 1426063, - 796918, 461373, 251658, 146801, 79692, 46137, 27263, 16777, -@@ -62,7 +62,7 @@ int lossy_quant[] = - 84, 42, 21, 0, 0, 0, 0, 0 - }; - --double lossy_quant_d[] = -+static const double lossy_quant_d[] = - { - 0, 1.6, 1.0, 0.8, 0.59, 0.50, 0.42, 0.34, - 0.19, 0.11, 0.06, 0.035, 0.019, 0.011, 0.0065, 0.0040, -@@ -71,7 +71,7 @@ double lossy_quant_d[] = - }; - - /* 20bits unsigned fractional binary codes */ --int lossless_quant[] = -+static const int lossless_quant[] = - { - 0, 4194304, 2097152, 1384120, 1048576, 696254, 524288, 348127, - 262144, 131072, 65431, 33026, 16450, 8208, 4100, 2049, -@@ -79,7 +79,7 @@ int lossless_quant[] = - 4, 2, 1, 0, 0, 0, 0, 0 - }; - --double lossless_quant_d[] = -+static const double lossless_quant_d[] = - { - 0, 1.0, 0.5, 0.33, 0.25, 0.166, 0.125, - 0.083, 0.0625, 0.03125, 0.0156, 7.874E-3, 3.922E-3, 1.957E-3, diff --git a/science/misc/coin/files/Coin-2.4.6-man3.diff b/science/misc/coin/files/Coin-2.4.6-man3.diff deleted file mode 100644 index 640e3959dc..0000000000 --- a/science/misc/coin/files/Coin-2.4.6-man3.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -uNr Coin-2.4.6.orig/man/man3/Makefile.am Coin-2.4.6/man/man3/Makefile.am ---- Coin-2.4.6.orig/man/man3/Makefile.am 2007-04-10 11:24:07.000000000 +0200 -+++ Coin-2.4.6/man/man3/Makefile.am 2007-04-14 06:27:29.000000000 +0200 -@@ -8,6 +8,7 @@ - "$(sim_ac_doxygen_exe)" docs/coin.doxygen ) - - filelist.txt: SoDB.3 -+ rm -f *_.3 - ls *.3 >filelist.txt - - -diff -uNr Coin-2.4.6.orig/man/man3/Makefile.in Coin-2.4.6/man/man3/Makefile.in ---- Coin-2.4.6.orig/man/man3/Makefile.in 2007-04-10 11:24:07.000000000 +0200 -+++ Coin-2.4.6/man/man3/Makefile.in 2007-04-14 06:27:30.000000000 +0200 -@@ -421,6 +421,7 @@ - "$(sim_ac_doxygen_exe)" docs/coin.doxygen ) - - filelist.txt: SoDB.3 -+ rm -f *_.3 - ls *.3 >filelist.txt - - @BUILD_MANPAGES_TRUE@all-local: filelist.txt diff --git a/science/misc/coin/files/Coin-2.4.6-openal-soname.diff b/science/misc/coin/files/Coin-2.4.6-openal-soname.diff deleted file mode 100644 index e206886d40..0000000000 --- a/science/misc/coin/files/Coin-2.4.6-openal-soname.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr Coin-2.4.6.orig/src/glue/openal_wrapper.c Coin-2.4.6/src/glue/openal_wrapper.c ---- Coin-2.4.6.orig/src/glue/openal_wrapper.c 2007-04-10 11:23:51.000000000 +0200 -+++ Coin-2.4.6/src/glue/openal_wrapper.c 2007-04-14 06:31:09.000000000 +0200 -@@ -107,7 +107,7 @@ - int idx; - const char * possiblelibnames[] = { - NULL, /* is set below */ -- "openal", "openal32", "libopenal.so", -+ @LIBOPENAL_SONAME@, - NULL - }; - diff --git a/science/misc/coin/files/Coin-2.5.0-inttypes.patch b/science/misc/coin/files/Coin-2.5.0-inttypes.patch deleted file mode 100644 index 3e130d7ef4..0000000000 --- a/science/misc/coin/files/Coin-2.5.0-inttypes.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -Naur Coin-2.5.0.gcc-4.7.0/include/Inventor/system/inttypes.h.in Coin-2.5.0.inttypes/include/Inventor/system/inttypes.h.in ---- Coin-2.5.0.gcc-4.7.0/include/Inventor/system/inttypes.h.in 2007-10-01 03:23:30.000000000 +0200 -+++ Coin-2.5.0.inttypes/include/Inventor/system/inttypes.h.in 2012-01-11 10:21:14.784355818 +0100 -@@ -32,146 +32,12 @@ - int32_t uint32_t - int64_t uint64_t - intptr_t uintptr_t -- -- (The 64-bit types are not guaranteed to be present, check for -- HAVE_INT64_T and HAVE_UINT64_T.) - */ - - /***************************************************************************/ - --/* Block of defines set up by the configure script. Protected with the -- #ifndef wrapper in case config.h was already included -- so we -- don't confuse the compiler to think we redefine already #define'd -- constants. */ --#ifndef COIN_CONFIGURE_BUILD /* (start wrapper) */ -- --/* -- This file was autogenerated by our configuration process -- specifically for this build configuration: --*/ --#undef COIN_CONFIGURE_BUILD --#undef COIN_CONFIGURE_HOST --#undef COIN_CONFIGURE_TARGET --/* -- The bit-type definitions may also be dependent on the compiler, -- compiler version and C library. -- -- So note that the bit-type definitions below might not match on other -- systems. Be extremely careful if you for whatever reason is -- installing this as a cross-platform header file (i.e.: you -- shouldn't). --*/ -- --/* FIXME: isn't it likely that the HAVE_*_H defines below could crash -- with defines in application code in a project using Autoconf -- configure? 20010711 mortene. */ -- --/* The header file. */ --#undef HAVE_INTTYPES_H --/* The header file. */ --#undef HAVE_STDINT_H --/* The header file. */ --#undef HAVE_SYS_TYPES_H --/* The header file. */ --#undef HAVE_STDDEF_H -- -- --/* If the system defines any of the types "on it's own", the -- respective #define will be set below. */ --#undef HAVE_INT8_T --#undef HAVE_UINT8_T --#undef HAVE_INT16_T --#undef HAVE_UINT16_T --#undef HAVE_INT32_T --#undef HAVE_UINT32_T --#undef HAVE_INT64_T --#undef HAVE_UINT64_T --#undef HAVE_INTPTR_T --#undef HAVE_UINTPTR_T -- --/* The type which the configure script found to match the given -- bitwidth. */ --#undef COIN_INT8_T --#undef COIN_UINT8_T --#undef COIN_INT16_T --#undef COIN_UINT16_T --#undef COIN_INT32_T --#undef COIN_UINT32_T --#undef COIN_INT64_T --#undef COIN_UINT64_T --#undef COIN_INTPTR_T --#undef COIN_UINTPTR_T -- --#endif /* (end wrapper) ! COIN_CONFIGURE_BUILD */ -- -- --/* The header files should be listed in the same order as they are in -- the SIM_AC_DEFINE_BYTESIZE_TYPES detection macro. This is the same -- order as the one Autoconf (currently upcoming 2.51) is using for its -- standard includes. 20010711 larsa */ --#ifdef HAVE_INTTYPES_H - #include --#else --#ifdef HAVE_STDINT_H --#include --#endif /* HAVE_STDINT_H */ --#endif --#ifdef HAVE_SYS_TYPES_H - #include --#endif /* HAVE_SYS_TYPES_H */ --#ifdef HAVE_STDDEF_H - #include --#endif /* HAVE_STDDEF_H */ -- -- --#if !defined(HAVE_INT8_T) && defined(COIN_INT8_T) --typedef COIN_INT8_T int8_t; --#define HAVE_INT8_T 1 --#endif /* !HAVE_INT8_T && COIN_INT8_T */ -- --#if !defined(HAVE_UINT8_T) && defined(COIN_UINT8_T) --typedef COIN_UINT8_T uint8_t; --#define HAVE_UINT8_T 1 --#endif /* !HAVE_UINT8_T && COIN_UINT8_T */ -- --#if !defined(HAVE_INT16_T) && defined(COIN_INT16_T) --typedef COIN_INT16_T int16_t; --#define HAVE_INT16_T 1 --#endif /* !HAVE_INT16_T && COIN_INT16_T */ -- --#if !defined(HAVE_UINT16_T) && defined(COIN_UINT16_T) --typedef COIN_UINT16_T uint16_t; --#define HAVE_UINT16_T 1 --#endif /* !HAVE_UINT16_T && COIN_UINT16_T */ -- --#if !defined(HAVE_INT32_T) && defined(COIN_INT32_T) --typedef COIN_INT32_T int32_t; --#define HAVE_INT32_T 1 --#endif /* !HAVE_INT32_T && COIN_INT32_T */ -- --#if !defined(HAVE_UINT32_T) && defined(COIN_UINT32_T) --typedef COIN_UINT32_T uint32_t; --#define HAVE_UINT32_T 1 --#endif /* !HAVE_UINT32_T && COIN_UINT32_T */ -- --#if !defined(HAVE_INT64_T) && defined(COIN_INT64_T) --typedef COIN_INT64_T int64_t; --#define HAVE_INT64_T 1 --#endif /* !HAVE_INT64_T && COIN_INT64_T */ -- --#if !defined(HAVE_UINT64_T) && defined(COIN_UINT64_T) --typedef COIN_UINT64_T uint64_t; --#define HAVE_UINT64_T 1 --#endif /* !HAVE_UINT64_T && COIN_UINT64_T */ -- --#if !defined(HAVE_INTPTR_T) && defined(COIN_INTPTR_T) --typedef COIN_INTPTR_T intptr_t; --#define HAVE_INTPTR_T 1 --#endif /* !HAVE_INTPTR_T && COIN_INTPTR_T */ -- --#if !defined(HAVE_UINTPTR_T) && defined(COIN_UINTPTR_T) --typedef COIN_UINTPTR_T uintptr_t; --#define HAVE_UINTPTR_T 1 --#endif /* !HAVE_UINTPTR_T && COIN_UINTPTR_T */ - - #endif /* !COIN_INTTYPES_H */ diff --git a/science/misc/coin/files/clang-name-lookup.diff b/science/misc/coin/files/clang-name-lookup.diff deleted file mode 100644 index 82a0053816..0000000000 --- a/science/misc/coin/files/clang-name-lookup.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- include/Inventor/SbBasic.h.orig 2012-10-28 16:49:00.000000000 +0100 -+++ include/Inventor/SbBasic.h 2012-10-28 16:50:15.000000000 +0100 -@@ -25,6 +25,7 @@ - \**************************************************************************/ - - #include -+#include - - /* ********************************************************************** */ - /* Trap people trying to use Inventor headers while compiling C source code. diff --git a/science/misc/coin/files/fix_gcc_4_8_1.patch b/science/misc/coin/files/fix_gcc_4_8_1.patch deleted file mode 100644 index 92950f4f92..0000000000 --- a/science/misc/coin/files/fix_gcc_4_8_1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar Coin-3.1.3.orig/src/fonts/freetype.cpp Coin-3.1.3/src/fonts/freetype.cpp ---- Coin-3.1.3.orig/src/fonts/freetype.cpp 2010-03-02 15:20:09.000000000 +0200 -+++ Coin-3.1.3/src/fonts/freetype.cpp 2013-08-25 00:38:16.678172194 +0300 -@@ -32,6 +32,8 @@ - - 20050613 mortene. */ - -+#include -+#include - #include "fonts/freetype.h" - - #ifdef HAVE_CONFIG_H